diff --git a/plugins/nginx-vhosts/command-functions b/plugins/nginx-vhosts/command-functions
index e13b31652..60657449f 100755
--- a/plugins/nginx-vhosts/command-functions
+++ b/plugins/nginx-vhosts/command-functions
@@ -117,6 +117,7 @@ cmd-nginx-stop() {
 
   touch "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped"
   fn-nginx-vhosts-nginx-init-cmd "stop"
+  fn-nginx-vhosts-nginx-init-cmd "disable"
 }
 
 cmd-nginx-start() {
@@ -125,6 +126,7 @@ cmd-nginx-start() {
   [[ "$1" == "$cmd" ]] && shift 1
 
   rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.stopped"
+  fn-nginx-vhosts-nginx-init-cmd "enable"
   fn-nginx-vhosts-nginx-init-cmd "start"
 }