diff --git a/src/lib/hooks/useAddress.ts b/src/lib/hooks/useAddress.ts
index 4904a956a..7b3785db7 100644
--- a/src/lib/hooks/useAddress.ts
+++ b/src/lib/hooks/useAddress.ts
@@ -65,6 +65,7 @@ const validateAddress = (
   return null;
 };
 
+// TODO: refactor
 export const useValidateAddress = () => {
   const { currentChainRecord } = useWallet();
 
diff --git a/src/lib/pages/instantiate/instantiate.tsx b/src/lib/pages/instantiate/instantiate.tsx
index ac27a43f2..24b18176d 100644
--- a/src/lib/pages/instantiate/instantiate.tsx
+++ b/src/lib/pages/instantiate/instantiate.tsx
@@ -240,10 +240,13 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
     }
   }, [codeIdQuery, msgQuery, reset, setValue]);
 
-  const validateAdmin = (input: string) =>
-    input && !!validateContractAddress(input) && !!validateUserAddress(input)
-      ? "Invalid Address"
-      : undefined;
+  const validateAdmin = useCallback(
+    (input: string) =>
+      input && !!validateContractAddress(input) && !!validateUserAddress(input)
+        ? "Invalid Address."
+        : undefined,
+    [validateContractAddress, validateUserAddress]
+  );
 
   return (
     <>