diff --git a/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx b/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
index 600d4b5ec..3994b9c10 100644
--- a/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
+++ b/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
@@ -408,7 +408,7 @@ export const OAuthCallbackPage = () => {
                 credentials: {
                   code: code as string,
                   installationId: installationId as string,
-                  host: credentials.host
+                  ...(credentials?.host && { host: credentials.host })
                 },
                 gatewayId
               }
@@ -416,7 +416,7 @@ export const OAuthCallbackPage = () => {
                 connectionId,
                 credentials: {
                   code: code as string,
-                  host: credentials.host
+                  ...(credentials?.host && { host: credentials.host })
                 },
                 gatewayId
               })
@@ -432,7 +432,7 @@ export const OAuthCallbackPage = () => {
                 credentials: {
                   code: code as string,
                   installationId: installationId as string,
-                  host: credentials.host
+                  ...(credentials?.host && { host: credentials.host })
                 },
                 gatewayId
               }
@@ -440,7 +440,7 @@ export const OAuthCallbackPage = () => {
                 method: GitHubConnectionMethod.OAuth,
                 credentials: {
                   code: code as string,
-                  host: credentials.host
+                  ...(credentials?.host && { host: credentials.host })
                 },
                 gatewayId
               })