diff --git a/server.py b/server.py
index 878b5eeb1..993d52daf 100644
--- a/server.py
+++ b/server.py
@@ -36,6 +36,9 @@ from app.custom_node_manager import CustomNodeManager
 from typing import Optional, Union
 from api_server.routes.internal.internal_routes import InternalRoutes
 
+if not args.disable_manager:
+    import comfyui_manager
+
 class BinaryEventTypes:
     PREVIEW_IMAGE = 1
     UNENCODED_PREVIEW_IMAGE = 2
@@ -175,6 +178,9 @@ class PromptServer():
         else:
             middlewares.append(create_origin_only_middleware())
 
+        if not args.disable_manager:
+            middlewares.append(comfyui_manager.create_middleware())
+
         max_upload_size = round(args.max_upload_size * 1024 * 1024)
         self.app = web.Application(client_max_size=max_upload_size, middlewares=middlewares)
         self.sockets = dict()