diff --git a/buildroot-external/rootfs-overlay/usr/bin/hassio-cli b/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
index 128ef571c..81bf07757 100755
--- a/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
+++ b/buildroot-external/rootfs-overlay/usr/bin/hassio-cli
@@ -7,27 +7,18 @@ CLI="$(jq --raw-output '.cli' ${CONFIG_FILE})"
 DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' ${CONFIG_FILE})"
 CLI_DATA=/mnt/data/cli
 
-##
-# Main program
-run_cli() {
-    # Run CLI
-    docker rm --force cli || true
-    docker run --name cli \
-        --rm -ti --init \
-        -v ${CLI_DATA}:/data \
-        $DOCKER_ARGS \
-        ${CLI}
-
-    # Jump to root shell
-    if [ $? -eq 10 ]; then
-        sh
-    fi
-}
-
-##
-# Run endless CLI
 mkdir -p ${CLI_DATA}
 
-while true; do
-    run_cli
-done
+# Run CLI
+docker run \
+    --rm -ti --init \
+    -v ${CLI_DATA}:/data \
+    $DOCKER_ARGS \
+    ${CLI}
+
+# Jump to root shell
+if [ $? -eq 10 ]; then
+    /bin/ash
+fi
+
+exit