diff --git a/gns3server/api/routes/compute/notifications.py b/gns3server/api/routes/compute/notifications.py
index 47b30f00..f784e3c3 100644
--- a/gns3server/api/routes/compute/notifications.py
+++ b/gns3server/api/routes/compute/notifications.py
@@ -50,11 +50,7 @@ async def project_ws_notifications(websocket: Union[None, WebSocket] = Depends(w
             log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from compute WebSocket")
         except WebSocketException as e:
             log.warning(f"Error while sending to controller event to WebSocket client: {e}")
-        finally:
-            try:
-                await websocket.close()
-            except OSError:
-                pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
+
 
 if __name__ == "__main__":
 
diff --git a/gns3server/api/routes/controller/controller.py b/gns3server/api/routes/controller/controller.py
index b47dd416..bc0a249f 100644
--- a/gns3server/api/routes/controller/controller.py
+++ b/gns3server/api/routes/controller/controller.py
@@ -221,11 +221,6 @@ async def controller_ws_notifications(
         log.info(f"Client {websocket.client.host}:{websocket.client.port} has disconnected from controller WebSocket")
     except WebSocketException as e:
         log.warning(f"Error while sending to controller event to WebSocket client: {e}")
-    finally:
-        try:
-            await websocket.close()
-        except OSError:
-            pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
 
 
 # @Route.post(
diff --git a/gns3server/api/routes/controller/projects.py b/gns3server/api/routes/controller/projects.py
index 758ab79f..433832a8 100644
--- a/gns3server/api/routes/controller/projects.py
+++ b/gns3server/api/routes/controller/projects.py
@@ -305,10 +305,6 @@ async def project_ws_notifications(
     except WebSocketException as e:
         log.warning(f"Error while sending to project event to WebSocket client: {e}")
     finally:
-        try:
-            await websocket.close()
-        except OSError:
-            pass  # ignore OSError: [Errno 107] Transport endpoint is not connected
         if project.auto_close:
             # To avoid trouble with client connecting disconnecting we sleep few seconds before checking
             # if someone else is not connected
diff --git a/gns3server/server.py b/gns3server/server.py
index f7f1d89e..abbfa5db 100644
--- a/gns3server/server.py
+++ b/gns3server/server.py
@@ -182,7 +182,7 @@ class Server:
                     asyncio.ensure_future(Controller.instance().reload())
                 else:
                     log.info(f"Server has got signal {signame}, exiting...")
-                    # send SIGTERM to the server PID so uvicorn can shutdown the process
+                    # send SIGTERM to the server PID so uvicorn can shut down the process
                     os.kill(os.getpid(), signal.SIGTERM)
             except asyncio.CancelledError:
                 pass