diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52abb6a..40796fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Arguments `--letsencrypt=clean/purge`
 - Incorrect directory removal during stack upgrade
 
-
 ### v3.9.6.1 - 2019-07-23
 
 #### Fixed
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index b0bf70f..573b42e 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -1298,6 +1298,7 @@ def removeNginxConf(self, domain):
 def removeAcmeConf(self, domain):
     if os.path.isdir('/etc/letsencrypt/renewal/{0}_ecc'
                      .format(domain)):
+        Log.info(self, "Removing Acme configuration")
         Log.debug(self, "Removing Acme configuration")
         try:
             WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
@@ -1308,18 +1309,21 @@ def removeAcmeConf(self, domain):
                                        .format(domain))
         except CommandExecutionError as e:
             Log.error(self, "Cert removal failed")
+
         WOFileUtils.rm(self, '/etc/letsencrypt/renewal/{0}_ecc'
                        .format(domain))
         WOFileUtils.rm(self, '/etc/letsencrypt/live/{0}'
                        .format(domain))
-        WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf'.format(domain))
+        WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf'
+                       .format(domain))
         WOFileUtils.rm(self, '/var/www/{0}/conf/nginx/ssl.conf.disabled'
                        .format(domain))
-        WOFileUtils.rm(
-            self, '/etc/nginx/conf.d/force-ssl-{0}.conf'.format(domain))
-        WOFileUtils.rm(
-            self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled'.format(domain))
+        WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf'
+                       .format(domain))
+        WOFileUtils.rm(self, '/etc/nginx/conf.d/force-ssl-{0}.conf.disabled'
+                       .format(domain))
 
+        updateSiteInfo(self, wo_domain, ssl=False)
         WOGit.add(self, ["/etc/letsencrypt"],
                   msg="Deleted {0} "
                   .format(domain))