diff --git a/plugins/auth-backend-module-auth0-provider/src/module.test.ts b/plugins/auth-backend-module-auth0-provider/src/module.test.ts
index 7e7f649831..394eb75693 100644
--- a/plugins/auth-backend-module-auth0-provider/src/module.test.ts
+++ b/plugins/auth-backend-module-auth0-provider/src/module.test.ts
@@ -54,7 +54,9 @@ describe('authModuleAuth0Provider', () => {
 
     const agent = request.agent(server);
 
-    const res = await agent.get('/api/auth/auth0/start?env=development');
+    const res = await agent.get(
+      '/api/auth/auth0/start?env=development&organization=foo-organization&invitation=foo-invitation',
+    );
 
     expect(res.status).toEqual(302);
 
@@ -78,6 +80,8 @@ describe('authModuleAuth0Provider', () => {
       accessType: 'offline',
       connection: 'connection',
       connection_scope: 'connectionScope',
+      organization: 'foo-organization',
+      invitation: 'foo-invitation',
       nonce: expect.any(String),
       state: expect.any(String),
     });
diff --git a/plugins/auth-backend-module-auth0-provider/src/strategy.ts b/plugins/auth-backend-module-auth0-provider/src/strategy.ts
index f45e672556..d644787bf5 100644
--- a/plugins/auth-backend-module-auth0-provider/src/strategy.ts
+++ b/plugins/auth-backend-module-auth0-provider/src/strategy.ts
@@ -49,10 +49,12 @@ export class Auth0Strategy extends Auth0InternalStrategy {
   }
 
   authenticate(req: express.Request, options: Record<string, any>): void {
+    const { organization, invitation } = req.query;
+
     super.authenticate(req, {
       ...options,
-      organization: req.query.organization,
-      invitation: req.query.invitation,
+      ...(organization ? { organization } : {}),
+      ...(invitation ? { invitation } : {}),
     });
   }