diff --git a/execution.py b/execution.py
index 1a6c3429c..9c1375bde 100644
--- a/execution.py
+++ b/execution.py
@@ -196,7 +196,7 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
             if io.Hidden.auth_token_comfy_org.name in hidden:
                 hidden_inputs_v3[io.Hidden.auth_token_comfy_org] = extra_data.get("auth_token_comfy_org", None)
             if io.Hidden.api_key_comfy_org.name in hidden:
-                hidden_inputs_v3[io.Hidden.api_key_comfy_org] = extra_data.get("api_key_comfy_org", None)
+                hidden_inputs_v3[io.Hidden.api_key_comfy_org] = extra_data.get("api_key_comfy_org") or extra_data.get("api_key")
     else:
         if "hidden" in valid_inputs:
             h = valid_inputs["hidden"]
@@ -212,7 +212,7 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
                 if h[x] == "AUTH_TOKEN_COMFY_ORG":
                     input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)]
                 if h[x] == "API_KEY_COMFY_ORG":
-                    input_data_all[x] = [extra_data.get("api_key_comfy_org", None)]
+                    input_data_all[x] = [extra_data.get("api_key_comfy_org") or extra_data.get("api_key")]
     v3_data["hidden_inputs"] = hidden_inputs_v3
     return input_data_all, missing_keys, v3_data
 
diff --git a/server.py b/server.py
index 85a8964be..74f65aa83 100644
--- a/server.py
+++ b/server.py
@@ -901,10 +901,14 @@ class PromptServer():
                     extra_data["client_id"] = json_data["client_id"]
                 if valid[0]:
                     outputs_to_execute = valid[2]
+                    if "api_key_comfy_org" not in extra_data and "api_key" in extra_data:
+                        extra_data["api_key_comfy_org"] = extra_data.pop("api_key")
                     sensitive = {}
                     for sensitive_val in execution.SENSITIVE_EXTRA_DATA_KEYS:
                         if sensitive_val in extra_data:
                             sensitive[sensitive_val] = extra_data.pop(sensitive_val)
+                    if "api_key" in extra_data:
+                        extra_data.pop("api_key")
                     extra_data["create_time"] = int(time.time() * 1000)  # timestamp in milliseconds
                     self.prompt_queue.put((number, prompt_id, prompt, extra_data, outputs_to_execute, sensitive))
                     response = {"prompt_id": prompt_id, "number": number, "node_errors": valid[3]}