diff --git a/ct/zwavejs2mqtt.sh b/ct/zwavejs2mqtt.sh
index 65034e6c..72669df9 100644
--- a/ct/zwavejs2mqtt.sh
+++ b/ct/zwavejs2mqtt.sh
@@ -43,11 +43,8 @@ option_picked(){
     printf " ${YW}${message1}${CL}\n"
 }
 show_menu
-while [ $opt != '' ]
+while [ "$opt" != " " ]
     do
-    if [ $opt = '' ]; then
-      exit;
-    else
       case $opt in
         1) clear;
             header_info;
@@ -71,7 +68,6 @@ while [ $opt != '' ]
             show_menu;
         ;;
       esac
-    fi
   done
 show_menu2(){
     printf "    ${YW} 1)${GN} Use Automatic Login ${CL}\n"
@@ -87,11 +83,8 @@ option_picked(){
     printf " ${YW}${message2}${CL}\n"
 }
 show_menu2
-while [ $opt != '' ]
+while [ "$opt" != " " ]
     do
-    if [ $opt = '' ]; then
-      exit;
-    else
       case $opt in
         1) clear;
             header_info;
@@ -115,7 +108,6 @@ while [ $opt != '' ]
             show_menu2;
         ;;
       esac
-    fi
   done
 show_menu3(){
     printf "    ${YW} 1)${GN} Automatic DHCP ${CL}\n"
@@ -132,11 +124,8 @@ option_picked(){
     printf " ${YW}${message3}${CL}\n"
 }
 show_menu3
-while [ $opt != '' ]
+while [ "$opt" != " " ]
     do
-    if [ $opt = '' ]; then
-      exit;
-    else
       case $opt in
         1) clear;
             header_info;
@@ -160,7 +149,6 @@ while [ $opt != '' ]
             show_menu3;
         ;;
       esac
-    fi
   done
 
 set -o errexit