diff --git a/src/serverroot/web/api/configServer.main.api.js b/src/serverroot/web/api/configServer.main.api.js
index dafdb5484..2a8734c2a 100644
--- a/src/serverroot/web/api/configServer.main.api.js
+++ b/src/serverroot/web/api/configServer.main.api.js
@@ -77,8 +77,10 @@ function configAppHeaders (headers, appData)
             }
         }
     } catch(e) {
-        headers['X-Auth-Token'] = null;
-        headers['X_API_ROLE'] = null;
+        if (true == multiTenancyEnabled) {
+            headers['X-Auth-Token'] = null;
+            headers['X_API_ROLE'] = null;
+        }
     }
     return headers;
 }