diff --git a/src/Site/Site.py b/src/Site/Site.py
index 09ff03c9..32f10abe 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -1059,6 +1059,7 @@ class Site(object):
         self.log.info("Deleting site...")
         s = time.time()
         self.settings["serving"] = False
+        self.settings["deleting"] = True
         self.saveSettings()
         num_greenlets = self.greenlet_manager.stopGreenlets("Site %s deleted" % self.address)
         self.worker_manager.running = False
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index e4819644..7fce398b 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -216,6 +216,9 @@ class UiWebsocket(object):
         else:  # Normal command
             func_name = self.getCmdFuncName(cmd)
             func = getattr(self, func_name, None)
+            if self.site.settings.get("deleting"):
+                return self.response(req["id"], {"error": "Site is deleting"})
+
             if not func:  # Unknown command
                 return self.response(req["id"], {"error": "Unknown command: %s" % cmd})