diff --git a/utilities/logic/wait_for.py b/utilities/logic/wait_for.py
index 1f549570516..4aa5bc78281 100644
--- a/utilities/logic/wait_for.py
+++ b/utilities/logic/wait_for.py
@@ -337,12 +337,15 @@ def main():
     if params['exclude_hosts'] is not None and state != 'drained':
         module.fail_json(msg="exclude_hosts should only be with state=drained")
 
+
     start = datetime.datetime.now()
 
     if delay:
         time.sleep(delay)
 
-    if state in [ 'stopped', 'absent' ]:
+    if not port and not path and state != 'drained':
+        time.sleep(timeout)
+    elif state in [ 'stopped', 'absent' ]:
         ### first wait for the stop condition
         end = start + datetime.timedelta(seconds=timeout)
 
@@ -365,6 +368,8 @@ def main():
                     time.sleep(1)
                 except:
                     break
+            else:
+                time.sleep(1)
         else:
             elapsed = datetime.datetime.now() - start
             if port:
@@ -427,6 +432,8 @@ def main():
                 except:
                     time.sleep(1)
                     pass
+            else:
+                time.sleep(1)
         else:
             elapsed = datetime.datetime.now() - start
             if port: