diff --git a/src/GoTrueClient.ts b/src/GoTrueClient.ts
index 00958fd65..be01fd94d 100644
--- a/src/GoTrueClient.ts
+++ b/src/GoTrueClient.ts
@@ -1112,6 +1112,7 @@ export default class GoTrueClient {
       }
 
       const { session, error } = await this._callRefreshToken(currentSession.refresh_token)
+
       if (error) {
         return { data: { session: null }, error }
       }
@@ -1293,6 +1294,10 @@ export default class GoTrueClient {
       }
 
       if (hasExpired) {
+        if (!this.autoRefreshToken) {
+          return { data: { user: null, session: null }, error: null }
+        }
+
         const { session: refreshedSession, error } = await this._callRefreshToken(
           currentSession.refresh_token
         )
@@ -1303,12 +1308,15 @@ export default class GoTrueClient {
         if (!refreshedSession) {
           return { data: { user: null, session: null }, error: null }
         }
+
         session = refreshedSession
       } else {
         const { data, error } = await this._getUser(currentSession.access_token)
+
         if (error) {
           throw error
         }
+
         session = {
           access_token: currentSession.access_token,
           refresh_token: currentSession.refresh_token,