diff --git a/src/spaceone/plugin/service/plugin_service.py b/src/spaceone/plugin/service/plugin_service.py
index cab1d1b..d3793c8 100644
--- a/src/spaceone/plugin/service/plugin_service.py
+++ b/src/spaceone/plugin/service/plugin_service.py
@@ -256,8 +256,10 @@ def _select_endpoint(self, plugin_ref, updated_version=None):
 
             if installed_plugin.current_index >= len(endpoints):
                 installed_plugin = installed_plugin.update({"current_index": 0})
+                current_index = 0
+            else:
+                current_index = installed_plugin.current_index
 
-            current_index = installed_plugin.current_index
             _LOGGER.debug(
                 f"[_select_endpoint] select endpoint. (index = {current_index}, endpoints = {endpoints})"
             )