diff --git a/app/client/src/pages/AppIDE/layouts/components/Header/index.tsx b/app/client/src/pages/AppIDE/layouts/components/Header/index.tsx
index e5b4a4aa77..9b2c64ec1a 100644
--- a/app/client/src/pages/AppIDE/layouts/components/Header/index.tsx
+++ b/app/client/src/pages/AppIDE/layouts/components/Header/index.tsx
@@ -142,7 +142,7 @@ const Header = () => {
   );
 
   const deployLink = useHref(viewerURL, {
-    basePageId: currentPage?.basePageId,
+    basePageId: currentPage?.basePageId || null,
   });
 
   const updateApplicationDispatch = (
diff --git a/app/client/src/pages/Editor/utils.tsx b/app/client/src/pages/Editor/utils.tsx
index d2e6c34d7f..a45cf5509e 100644
--- a/app/client/src/pages/Editor/utils.tsx
+++ b/app/client/src/pages/Editor/utils.tsx
@@ -300,7 +300,15 @@ export function useHref<T extends URLBuilderParams>(
   const pageId = useSelector(getCurrentPageId);
 
   useEffect(() => {
-    if (pageId) setHref(urlBuilderFn(params));
+    if (pageId) {
+      try {
+        setHref(urlBuilderFn(params));
+      } catch (error) {
+        // If basePageId is not available yet, keep href as empty string
+        // This can happen during initial page load or navigation
+        setHref("");
+      }
+    }
   }, [params, urlBuilderFn, pageId]);
 
   return href;