diff --git a/oraclient-choreographe-app-v5/app/scripts/main.py b/oraclient-choreographe-app-v5/app/scripts/main.py
index 2cbd8e6..247beb1 100644
--- a/oraclient-choreographe-app-v5/app/scripts/main.py
+++ b/oraclient-choreographe-app-v5/app/scripts/main.py
@@ -405,7 +405,7 @@ def _wait_for_service(self, service_name, max_delay_in_seconds=60):
                 return True
             except RuntimeError:
                 time.sleep(1.0)
-                return
+        return
         # Failed, give up
 
     def on_start(self):
diff --git a/oraclient-choreographe-app-v6/app/scripts/main.py b/oraclient-choreographe-app-v6/app/scripts/main.py
index 6525029..5295b3e 100644
--- a/oraclient-choreographe-app-v6/app/scripts/main.py
+++ b/oraclient-choreographe-app-v6/app/scripts/main.py
@@ -401,7 +401,7 @@ def _wait_for_service(self, service_name, max_delay_in_seconds=60):
                 return True
             except RuntimeError:
                 time.sleep(1.0)
-                return
+        return
         # Failed, give up
 
     def on_start(self):