diff --git a/src/freedombone-config b/src/freedombone-config
index c27f3832..c0a5e7fd 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -145,7 +145,9 @@ function save_configuration_file {
   echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
   echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
   echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
-  echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE
+  if [ $ENABLE_CJDNS ]; then
+      echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE
+  fi
   echo "DEBIAN_REPO=$DEBIAN_REPO" >> $CONFIGURATION_FILE
   echo "NAMESERVER1=$NAMESERVER1" >> $CONFIGURATION_FILE
   echo "NAMESERVER2=$NAMESERVER2" >> $CONFIGURATION_FILE