diff --git a/src/pages/JoinPage/index.tsx b/src/pages/JoinPage/index.tsx
index f568221ce..b28ffbd20 100644
--- a/src/pages/JoinPage/index.tsx
+++ b/src/pages/JoinPage/index.tsx
@@ -2,12 +2,20 @@
  * JoinPage - Router principale
  * Gestisce il routing tra Signup, Onboarding e Invited User flows
  */
-import { Navigate, Route, Routes } from 'react-router-dom';
+import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import SignupPage from './SignupPage';
 import OnboardingPage from './OnboardingPage';
 import InvitedUserPage from './InvitedUserPage';
 import { PublicRoute, OnboardingRoute, InvitedRoute } from './RouteGuards';
 
+/**
+ * Componente per reindirizzare a signup mantenendo i search params
+ */
+const DefaultRedirect = () => {
+  const location = useLocation();
+  return <Navigate to={`signup${location.search}`} replace />;
+};
+
 const JoinPage = () => (
   <Routes>
     <Route
@@ -34,7 +42,7 @@ const JoinPage = () => (
         </InvitedRoute>
       }
     />
-    <Route path="*" element={<Navigate to="signup" replace />} />
+    <Route path="*" element={<DefaultRedirect />} />
   </Routes>
 );
 
diff --git a/src/pages/JoinPage/sendToHubspot.ts b/src/pages/JoinPage/sendToHubspot.ts
index 33b66f6a7..8b1206d35 100644
--- a/src/pages/JoinPage/sendToHubspot.ts
+++ b/src/pages/JoinPage/sendToHubspot.ts
@@ -102,12 +102,14 @@ export async function sendToHubspot(data: {
     });
 
     if (!response.ok) {
+      // eslint-disable-next-line no-console
       console.error(`HubSpot API error: ${response.statusText}`);
       return false;
     }
 
     return await response.json();
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.error('Error submitting to HubSpot:', error);
     return false;
   }