diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
index f2e0a20ee..9164eb404 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
@@ -3,12 +3,18 @@
 # Run logging cli
 # ==============================================================================
 
-docker container exec \
-    -ti hassio_cli \
-    /usr/bin/cli.sh \
+# Run CLI container
+if [ "$(docker ps -q -f name=hassio_cli)" ]; then
+    docker container exec \
+        -ti hassio_cli \
+        /usr/bin/cli.sh \
 
-# Jump to root login shell
-if [ $? -eq 10 ]; then
+    # Jump to root login shell
+    if [ $? -eq 10 ]; then
+        /bin/ash -l
+    fi
+else
+    echo "[ERROR] Somethings going wrong! Jump into emergency console..."
     /bin/ash -l
 fi