diff --git a/tripleoclient/workflows/base.py b/tripleoclient/workflows/base.py
index 9efe1d245..2ac0aaf72 100644
--- a/tripleoclient/workflows/base.py
+++ b/tripleoclient/workflows/base.py
@@ -71,7 +71,7 @@ def wait_for_messages(mistral, websocket, execution, timeout=None):
             # Workflows should end with SUCCESS or ERROR statuses.
             if payload.get('status', 'RUNNING') != "RUNNING" or \
                     mistral.executions.get(execution.id).state != "RUNNING":
-                raise StopIteration
+                return
     except exceptions.WebSocketTimeout:
         check_execution_status(mistral, execution.id)
         raise