diff --git a/lib/state.py b/lib/state.py
index 93c0eb6..1e117b9 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -362,7 +362,8 @@
 
         if must_login:
             output, stderr, rc = bsu.os_execute_command("uptime", quiet=quiet,
-                                                        ignore_err=1)
+                                                        ignore_err=1,
+                                                        time_out=20)
             if rc == 0:
                 os_login = 1
                 os_run_cmd = 1