diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index fbbf42ca..22e3d122 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -780,11 +780,6 @@ class EESiteUpdateController(CementBaseController):
                     Log.info(self, "HHVM is allready enabled for given "
                              "site")
 
-        if self.app.pargs.pagespeed or self.app.pargs.hhvm:
-            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
-               (stype == oldsitetype and cache == oldcachetype)):
-                self.app.close(0)
-
         if data and (not self.app.pargs.hhvm):
             if old_hhvm is True:
                 data['hhvm'] = True
@@ -801,6 +796,11 @@ class EESiteUpdateController(CementBaseController):
                 data['pagespeed'] = False
                 pagespeed = False
 
+        if self.app.pargs.pagespeed or self.app.pargs.hhvm:
+            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
+               (stype == oldsitetype and cache == oldcachetype)):
+                self.app.close(0)
+
         if not data:
             Log.error(self, " Cannot update {0}, Invalid Options"
                       .format(ee_domain))