diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index f48f29d6e96..2b3e7803bce 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -52,9 +52,9 @@ case "$1" in
     verify_app_name "$2"
     APP="$2"
 
-    if [[ "$(is_app_nginx_enabled $APP)" == "true" ]]; then
-      config_unset --no-restart $APP DOKKU_NO_NGINX
-      unset DOKKU_NO_NGINX
+    if [[ "$(is_app_nginx_enabled $APP)" == "false" ]]; then
+      config_unset --no-restart $APP DOKKU_NO_NGINX NO_VHOST
+      unset DOKKU_NO_NGINX NO_VHOST
       nginx_build_config $APP
     else
       dokku_log_info1 "nginx is already enabled for app ($APP)"