diff --git a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
index bfd02838fc..eeb6b4599c 100644
--- a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
+++ b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
@@ -19,7 +19,11 @@ export const GitHubCredentials = () => {
 
   useEffect(() => {
     refresh()
-    setScopeWarning(!(context.gitHubScopes && context.gitHubScopes.length > 0))
+    if(context.gitHubUser){
+      setScopeWarning(!(context.gitHubScopes && context.gitHubScopes.length > 0))
+    }else{
+      setScopeWarning(false)
+    }
   }, [loader.plugin, context.gitHubAccessToken, context.userEmails, context.gitHubUser, context.gitHubScopes])
 
   function handleChangeTokenState(e: string): void {