diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index e292355f..0827f4e3 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -608,7 +608,7 @@ def site_package_check(self, stype):
     # Check if Nginx is allready installed and Pagespeed config there or not
     # If not then copy pagespeed config
     if self.app.pargs.pagespeed:
-        if (os.path.isdir('/etc/nginx') and
+        if (os.path.isfile('/etc/nginx/nginx.conf') and
            (not os.path.isfile('/etc/nginx/conf.d/pagespeed.conf'))):
             # Pagespeed configuration
             data = dict()
diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py
index 8b1ec21a..fada0f61 100644
--- a/ee/cli/plugins/stack.py
+++ b/ee/cli/plugins/stack.py
@@ -624,9 +624,8 @@ class EEStackController(CementBaseController):
 
                 EEGit.add(self, ["/etc/hhvm"], msg="Adding HHVM into Git")
                 EEService.restart_service(self, 'hhvm')
-                EEService.reload_service(self, 'nginx')
 
-                if os.path.isdir("/etc/nginx") and (not
+                if os.path.isfile("/etc/nginx/nginx.conf") and (not
                    os.path.isfile("/etc/nginx/common/php-hhvm.conf")):
 
                     data = dict()
@@ -662,6 +661,8 @@ class EEStackController(CementBaseController):
                                     out=ee_nginx)
                     ee_nginx.close()
 
+                    EEService.reload_service(self, 'nginx')
+
             if set(EEVariables.ee_mysql).issubset(set(apt_packages)):
                 # TODO: Currently we are using, we need to remove it in future
                 # config = configparser.ConfigParser()