From a3cf272522f9820c3f379aa821729404cb4cf821 Mon Sep 17 00:00:00 2001
From: comfyanonymous <121283862+comfyanonymous@users.noreply.github.com>
Date: Sat, 28 Jun 2025 12:53:40 -0700
Subject: [PATCH] Skip custom node logic completely if disabled and no
 whitelisted nodes. (#8719)

---
 main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 5dd3c92d..d488c0f4 100644
--- a/main.py
+++ b/main.py
@@ -55,6 +55,9 @@ def apply_custom_paths():
 
 
 def execute_prestartup_script():
+    if args.disable_all_custom_nodes and len(args.whitelist_custom_nodes) == 0:
+        return
+
     def execute_script(script_path):
         module_name = os.path.splitext(script_path)[0]
         try:
@@ -277,7 +280,7 @@ def start_comfyui(asyncio_loop=None):
 
     hook_breaker_ac10a0.save_functions()
     nodes.init_extra_nodes(
-        init_custom_nodes=True,
+        init_custom_nodes=(not args.disable_all_custom_nodes) or len(args.whitelist_custom_nodes) > 0,
         init_api_nodes=not args.disable_api_nodes
     )
     hook_breaker_ac10a0.restore_functions()