diff --git a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
index a226b7e7e8..82dc2492d6 100644
--- a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
+++ b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
@@ -12,29 +12,21 @@ function ImpersonatingBanner({ data }: ImpersonatingBannerProps) {
   if (!data?.user.impersonatedBy) return null;
   const returnToId = data.user.impersonatedBy.id;
 
-  const canReturnToSelf = data.user.impersonatedBy.role == "ADMIN" || data.user?.org?.id;
-
   return (
     <>
       <TopBanner
         text={t("impersonating_user_warning", { user: data.user.orgAwareUsername || data.user.username })}
         variant="warning"
         actions={
-          canReturnToSelf ? (
-            <form
-              onSubmit={(e) => {
-                e.preventDefault();
-                signIn("impersonation-auth", { returnToId });
-              }}>
-              <button className="text-emphasis hover:underline" data-testid="stop-impersonating-button">
-                {t("impersonating_stop_instructions")}
-              </button>
-            </form>
-          ) : (
-            <a className="border-b border-b-black" href="/auth/logout">
+          <form
+            onSubmit={(e) => {
+              e.preventDefault();
+              signIn("impersonation-auth", { returnToId });
+            }}>
+            <button className="text-emphasis hover:underline" data-testid="stop-impersonating-button">
               {t("impersonating_stop_instructions")}
-            </a>
-          )
+            </button>
+          </form>
         }
       />
     </>
diff --git a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts b/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
index 7ba23bcaa7..2f601252b4 100644
--- a/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
+++ b/packages/features/ee/impersonation/lib/ImpersonationProvider.ts
@@ -301,13 +301,11 @@ async function isReturningToSelf({ session, creds }: { session: Session | null;
   });
 
   if (returningUser) {
-    // Skip for none org users
     const inOrg =
       returningUser.organizationId || // Keep for backwards compatibility
       returningUser.profiles.some((profile) => profile.organizationId !== undefined); // New way of seeing if the user has a profile in orgs.
-    if (returningUser.role !== UserPermissionRole.ADMIN && !inOrg) return;
-
     const hasTeams = returningUser.teams.length >= 1;
+    if (returningUser.role !== UserPermissionRole.ADMIN && !inOrg && !hasTeams) return;
 
     const profile = await findProfile(returningUser);
     return {