diff --git a/packages/frontend/src/components/shared/Input/Input.tsx b/packages/frontend/src/components/shared/Input/Input.tsx
index 0905f556..f5bbdca5 100644
--- a/packages/frontend/src/components/shared/Input/Input.tsx
+++ b/packages/frontend/src/components/shared/Input/Input.tsx
@@ -58,7 +58,7 @@ export const Input = ({
         {cloneIcon(leftIcon, { className: iconCls(), ariaHidden: true })}
       </div>
     );
-  }, [iconCls, leftIcon]);
+  }, [cloneIcon, iconCls, iconContainerCls, leftIcon]);
 
   const renderRightIcon = useMemo(() => {
     return (
@@ -66,7 +66,7 @@ export const Input = ({
         {cloneIcon(rightIcon, { className: iconCls(), ariaHidden: true })}
       </div>
     );
-  }, [rightIcon, iconCls]);
+  }, [cloneIcon, iconCls, iconContainerCls, rightIcon]);
 
   const renderHelperText = useMemo(
     () => (
@@ -78,7 +78,7 @@ export const Input = ({
         <p>{helperText}</p>
       </div>
     ),
-    [state, helperText, helperTextCls],
+    [cloneIcon, state, helperIconCls, helperText, helperTextCls],
   );
 
   return (