diff --git a/blenderkit/search.py b/blenderkit/search.py
index 569d6a76dab22aaae386b65f19a029f3771bee45..b4d3b7fe121a20f48179e2f75792ebe2832b8c6d 100644
--- a/blenderkit/search.py
+++ b/blenderkit/search.py
@@ -66,7 +66,8 @@ def check_errors(rdata):
         if rdata.get('detail') == 'Invalid token.':
             user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
             if user_preferences.api_key != '':
-                bkit_oauth.refresh_token_thread()
+                if user_preferences.enable_oauth:
+                    bkit_oauth.refresh_token_thread()
                 return False, "You've been logged out. Logging in...."
             return False, 'Missing or wrong api_key in addon preferences'
     return True, ''
@@ -103,7 +104,8 @@ def fetch_server_data():
     url = paths.BLENDERKIT_ADDON_URL
     api_key = user_preferences.api_key
     # version_checker.check_version_thread(url, api_key, blenderkit)
-    bkit_oauth.refresh_token_thread()
+    if user_preferences.enable_oauth:
+        bkit_oauth.refresh_token_thread()
     get_profile()
     categories.fetch_categories_thread(api_key)