diff --git a/src/App.h b/src/App.h
index a6b7da0..87f5c14 100644
--- a/src/App.h
+++ b/src/App.h
@@ -249,12 +249,14 @@ public:
         MoveOnlyFunction<void(WebSocket<SSL, true, UserData> *, int, std::string_view)> close = nullptr;
     };
 
-    /* Closes all sockets. Does not close listen sockets. */
-    TemplatedApp &&closeSockets() {
-        us_socket_context_close(SSL, httpContext);
+    /* Closes all sockets including listen sockets. */
+    TemplatedApp &&close() {
+        us_socket_context_close(SSL, (struct us_socket_context_t *) httpContext);
         for (void *webSocketContext : webSocketContexts) {
-            us_socket_context_close(SSL, webSocketContext);
+            us_socket_context_close(SSL, (struct us_socket_context_t *) webSocketContext);
         }
+
+        return std::move(*this);
     }
 
     template <typename UserData>
diff --git a/uSockets b/uSockets
index afd527a..034575d 160000
--- a/uSockets
+++ b/uSockets
@@ -1 +1 @@
-Subproject commit afd527a99c427b19f4441855f47c1340ed9962ea
+Subproject commit 034575d651450077244930cce915216a1fa0de5d