diff --git a/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx b/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx
index 8e1b236722..2291b0af5d 100644
--- a/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx
+++ b/frontend/__tests__/components/modals/settings/account-settings-modal.test.tsx
@@ -132,6 +132,7 @@ describe("AccountSettingsModal", () => {
       agent: "CodeActAgent",
       confirmation_mode: false,
       enable_default_condenser: false,
+      github_token: undefined,
       language: "en",
       llm_base_url: "",
       llm_model: "anthropic/claude-3-5-sonnet-20241022",
diff --git a/frontend/src/context/auth-context.tsx b/frontend/src/context/auth-context.tsx
index e7aed7b0d4..3e42759b9e 100644
--- a/frontend/src/context/auth-context.tsx
+++ b/frontend/src/context/auth-context.tsx
@@ -5,10 +5,16 @@ interface AuthContextType {
   setGitHubTokenIsSet: (value: boolean) => void;
 }
 
+interface AuthContextProps extends React.PropsWithChildren {
+  initialGithubTokenIsSet?: boolean;
+}
+
 const AuthContext = React.createContext<AuthContextType | undefined>(undefined);
 
-function AuthProvider({ children }: React.PropsWithChildren) {
-  const [githubTokenIsSet, setGitHubTokenIsSet] = React.useState(false);
+function AuthProvider({ children, initialGithubTokenIsSet }: AuthContextProps) {
+  const [githubTokenIsSet, setGitHubTokenIsSet] = React.useState(
+    !!initialGithubTokenIsSet,
+  );
 
   const value = React.useMemo(
     () => ({
diff --git a/frontend/src/hooks/query/use-settings.ts b/frontend/src/hooks/query/use-settings.ts
index 107a91c692..f47240e382 100644
--- a/frontend/src/hooks/query/use-settings.ts
+++ b/frontend/src/hooks/query/use-settings.ts
@@ -50,13 +50,5 @@ export const useSettings = () => {
     setGitHubTokenIsSet(!!query.data?.GITHUB_TOKEN_IS_SET);
   }, [query.data?.GITHUB_TOKEN_IS_SET, query.isFetched]);
 
-  // Return default settings if in SAAS mode and not authenticated
-  if (config?.APP_MODE === "saas" && !githubTokenIsSet) {
-    return {
-      ...query,
-      data: DEFAULT_SETTINGS,
-    };
-  }
-
   return query;
 };
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 53305537a0..f712998877 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -15,6 +15,4 @@ export default [
       route("served", "routes/app.tsx"),
     ]),
   ]),
-
-  route("oauth/github/callback", "routes/oauth.github.callback.tsx"),
 ] satisfies RouteConfig;
diff --git a/frontend/src/routes/oauth.github.callback.tsx b/frontend/src/routes/oauth.github.callback.tsx
deleted file mode 100644
index f10fcf23e6..0000000000
--- a/frontend/src/routes/oauth.github.callback.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useNavigate, useSearchParams } from "react-router";
-import { useQuery } from "@tanstack/react-query";
-import React from "react";
-import OpenHands from "#/api/open-hands";
-
-function OAuthGitHubCallback() {
-  const navigate = useNavigate();
-  const [searchParams] = useSearchParams();
-  const code = searchParams.get("code");
-
-  const { isSuccess, error } = useQuery({
-    queryKey: ["access_token", code],
-    queryFn: () => OpenHands.getGitHubAccessToken(code!),
-    enabled: !!code,
-  });
-
-  React.useEffect(() => {
-    if (isSuccess) {
-      navigate("/");
-    }
-  }, [isSuccess]);
-
-  if (error) {
-    return (
-      <div>
-        <h1>Error</h1>
-        <p>{error.message}</p>
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <h1>Redirecting...</h1>
-    </div>
-  );
-}
-
-export default OAuthGitHubCallback;
diff --git a/frontend/test-utils.tsx b/frontend/test-utils.tsx
index 42bd9ec6e0..d39ced887a 100644
--- a/frontend/test-utils.tsx
+++ b/frontend/test-utils.tsx
@@ -66,7 +66,7 @@ export function renderWithProviders(
   function Wrapper({ children }: PropsWithChildren) {
     return (
       <Provider store={store}>
-        <AuthProvider>
+        <AuthProvider initialGithubTokenIsSet={true}>
           <QueryClientProvider
             client={
               new QueryClient({