diff --git a/config/bash_completion.d/ee_auto.rc b/config/bash_completion.d/ee_auto.rc
index bff525f3..fa9b0d80 100644
--- a/config/bash_completion.d/ee_auto.rc
+++ b/config/bash_completion.d/ee_auto.rc
@@ -239,7 +239,6 @@ _ee_complete()
                     elif [ ${COMP_WORDS[2]} == "reset" ]; then
                         retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db"
 
-
                     elif [ ${COMP_WORDS[2]} == "mail" ]; then
                         retlist="--access --nginx --php --mysql --fpm --wp --to="
 
diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index 7f394f1e..c1271ca6 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -685,6 +685,10 @@ class EESiteUpdateController(CementBaseController):
                 Log.info(self, "Password Unchanged.")
             return 0
 
+        if stype == "html" and self.app.pargs.hhvm:
+            Log.info(self, Log.FAIL + "Can not update HTML site to HHVM")
+            return 1
+
         if ((stype == 'php' and oldsitetype != 'html') or
             (stype == 'mysql' and oldsitetype not in ['html', 'php']) or
             (stype == 'wp' and oldsitetype not in ['html', 'php', 'mysql',