diff --git a/evennia/server/portal/webclient_ajax.py b/evennia/server/portal/webclient_ajax.py
index fb4d3d5c20..5a6e442295 100644
--- a/evennia/server/portal/webclient_ajax.py
+++ b/evennia/server/portal/webclient_ajax.py
@@ -336,11 +336,6 @@ class AjaxWebClient(resource.Resource):
             del self.requests[csessid]
         if csessid in self.databuffer:
             del self.databuffer[csessid]
-        if csessid in self.requests:
-            self.requests[csessid].finish()
-            del self.requests[csessid]
-        if csessid in self.databuffer:
-            del self.databuffer[csessid]
 
     def mode_init(self, request):
         """
@@ -436,7 +431,6 @@ class AjaxWebClient(resource.Resource):
         csessid = self.get_client_sessid(request) + self.get_client_page_id(request)
         self.last_alive[csessid] = (time.time(), False)
 
-        dataentries = self.databuffer.get(csessid)
         dataentries = self.databuffer.get(csessid)
         if dataentries:
             # we have data that could not be sent earlier (because client was not
@@ -449,10 +443,6 @@ class AjaxWebClient(resource.Resource):
             if csessid in self.requests:
                 self.requests[csessid].finish()  # Clear any stale request.
             self.requests[csessid] = request
-            request.notifyFinish().addErrback(self._responseFailed, csessid, request)
-            if csessid in self.requests:
-                self.requests[csessid].finish()  # Clear any stale request.
-            self.requests[csessid] = request
             return server.NOT_DONE_YET
 
     def mode_close(self, request):
@@ -466,12 +456,10 @@ class AjaxWebClient(resource.Resource):
         """
         csessid = self.get_client_sessid(request) + self.get_client_page_id(request)
         try:
-            sess = self.sessionhandler.sessions_from_csessid(csessid)[0]
             sess = self.sessionhandler.sessions_from_csessid(csessid)[0]
             sess.sessionhandler.disconnect(sess)
         except IndexError:
             self.client_disconnect(csessid)
-            self.client_disconnect(csessid)
         return b'""'
 
     def render_POST(self, request):