diff --git a/plugins/oidc/server/auth/oidc.test.ts b/plugins/oidc/server/auth/oidc.test.ts
new file mode 100644
index 000000000..0e0013dc1
--- /dev/null
+++ b/plugins/oidc/server/auth/oidc.test.ts
@@ -0,0 +1,14 @@
+import { getTestServer } from "@server/test/support";
+
+const server = getTestServer();
+
+describe("oidc", () => {
+  it("should pass query params along with auth redirect", async () => {
+    const res = await server.get("/auth/oidc?myParam=someParam", {
+      redirect: "manual",
+    });
+    const redirectLocation = new URL(res.headers.get("location"));
+    expect(res.status).toEqual(302);
+    expect(redirectLocation.searchParams.get("myParam")).toEqual("someParam");
+  });
+});
diff --git a/plugins/oidc/server/auth/oidc.ts b/plugins/oidc/server/auth/oidc.ts
index 39cb6e9dd..9a6de60d4 100644
--- a/plugins/oidc/server/auth/oidc.ts
+++ b/plugins/oidc/server/auth/oidc.ts
@@ -33,6 +33,20 @@ Strategy.prototype.userProfile = async function (accessToken, done) {
   }
 };
 
+const authorizationParams = Strategy.prototype.authorizationParams;
+Strategy.prototype.authorizationParams = function (options) {
+  return {
+    ...(options.originalQuery || {}),
+    ...(authorizationParams.bind(this)(options) || {}),
+  };
+};
+
+const authenticate = Strategy.prototype.authenticate;
+Strategy.prototype.authenticate = function (req, options) {
+  options.originalQuery = req.query;
+  authenticate.bind(this)(req, options);
+};
+
 if (
   env.OIDC_CLIENT_ID &&
   env.OIDC_CLIENT_SECRET &&
diff --git a/server/routes/api/auth.test.ts b/server/routes/api/auth.test.ts
index 90c1b32df..0a25ec8c0 100644
--- a/server/routes/api/auth.test.ts
+++ b/server/routes/api/auth.test.ts
@@ -100,9 +100,10 @@ describe("#auth.config", () => {
     const res = await server.post("/api/auth.config");
     const body = await res.json();
     expect(res.status).toEqual(200);
-    expect(body.data.providers.length).toBe(2);
+    expect(body.data.providers.length).toBe(3);
     expect(body.data.providers[0].name).toBe("Slack");
-    expect(body.data.providers[1].name).toBe("Google");
+    expect(body.data.providers[1].name).toBe("OpenID Connect");
+    expect(body.data.providers[2].name).toBe("Google");
   });
 
   it("should return available providers for team subdomain", async () => {
@@ -221,9 +222,10 @@ describe("#auth.config", () => {
       const res = await server.post("/api/auth.config");
       const body = await res.json();
       expect(res.status).toEqual(200);
-      expect(body.data.providers.length).toBe(2);
+      expect(body.data.providers.length).toBe(3);
       expect(body.data.providers[0].name).toBe("Google");
-      expect(body.data.providers[1].name).toBe("Slack");
+      expect(body.data.providers[1].name).toBe("OpenID Connect");
+      expect(body.data.providers[2].name).toBe("Slack");
     });
 
     it("should return email provider for team when guest signin enabled", async () => {
@@ -240,10 +242,11 @@ describe("#auth.config", () => {
       const res = await server.post("/api/auth.config");
       const body = await res.json();
       expect(res.status).toEqual(200);
-      expect(body.data.providers.length).toBe(3);
+      expect(body.data.providers.length).toBe(4);
       expect(body.data.providers[0].name).toBe("Slack");
-      expect(body.data.providers[1].name).toBe("Google");
-      expect(body.data.providers[2].name).toBe("Email");
+      expect(body.data.providers[1].name).toBe("OpenID Connect");
+      expect(body.data.providers[2].name).toBe("Google");
+      expect(body.data.providers[3].name).toBe("Email");
     });
   });
 });
diff --git a/server/routes/api/authenticationProviders/authenticationProviders.test.ts b/server/routes/api/authenticationProviders/authenticationProviders.test.ts
index e4a421d0e..8c5b3d1b4 100644
--- a/server/routes/api/authenticationProviders/authenticationProviders.test.ts
+++ b/server/routes/api/authenticationProviders/authenticationProviders.test.ts
@@ -133,13 +133,16 @@ describe("#authenticationProviders.list", () => {
     });
     const body = await res.json();
     expect(res.status).toEqual(200);
-    expect(body.data.length).toBe(2);
+    expect(body.data.length).toBe(3);
     expect(body.data[0].name).toBe("slack");
     expect(body.data[0].isEnabled).toBe(true);
     expect(body.data[0].isConnected).toBe(true);
     expect(body.data[1].name).toBe("google");
     expect(body.data[1].isEnabled).toBe(false);
     expect(body.data[1].isConnected).toBe(false);
+    expect(body.data[2].name).toBe("oidc");
+    expect(body.data[2].isEnabled).toBe(false);
+    expect(body.data[2].isConnected).toBe(false);
   });
 
   it("should require authentication", async () => {
diff --git a/server/test/env.ts b/server/test/env.ts
index be6053e06..31c47802f 100644
--- a/server/test/env.ts
+++ b/server/test/env.ts
@@ -10,8 +10,11 @@ env.SLACK_CLIENT_SECRET = "123";
 
 env.AZURE_CLIENT_ID = undefined;
 env.AZURE_CLIENT_SECRET = undefined;
-env.OIDC_CLIENT_ID = undefined;
-env.OIDC_CLIENT_SECRET = undefined;
+env.OIDC_CLIENT_ID = "client-id";
+env.OIDC_CLIENT_SECRET = "client-secret";
+env.OIDC_AUTH_URI = "http://localhost/authorize";
+env.OIDC_TOKEN_URI = "http://localhost/token";
+env.OIDC_USERINFO_URI = "http://localhost/userinfo";
 
 env.RATE_LIMITER_ENABLED = false;
 env.DEPLOYMENT = undefined;