diff --git a/src/frontend/src/CustomNodes/helpers/count-handles.ts b/src/frontend/src/CustomNodes/helpers/count-handles.ts
index f529d21dc..a0acf78f6 100644
--- a/src/frontend/src/CustomNodes/helpers/count-handles.ts
+++ b/src/frontend/src/CustomNodes/helpers/count-handles.ts
@@ -9,8 +9,10 @@ export function countHandlesFn(data: NodeDataType): number {
     )
     .map((templateCamp) => {
       const { template } = data.node!;
-      if (template[templateCamp]?.input_types) return true;
+      if (template[templateCamp]?.tool_mode && data.node?.tool_mode)
+        return false;
       if (!template[templateCamp]?.show) return false;
+      if (template[templateCamp]?.input_types) return true;
       switch (template[templateCamp]?.type) {
         case "str":
         case "bool":
@@ -18,8 +20,10 @@ export function countHandlesFn(data: NodeDataType): number {
         case "code":
         case "prompt":
         case "file":
+        case "table":
         case "int":
           return false;
+
         default:
           return true;
       }