diff --git a/trains/backend_api/config/default/api.conf b/trains/backend_api/config/default/api.conf
index a084bcbb..1ba191c9 100644
--- a/trains/backend_api/config/default/api.conf
+++ b/trains/backend_api/config/default/api.conf
@@ -2,6 +2,12 @@
     version: 1.5
     host: https://demoapi.trainsai.io
 
+    # default demoapi.trainsai.io credentials
+    credentials {
+        access_key: "EGRTCO8JMSIGI6S39GTP43NFWXDQOW"
+        secret_key: "x!XTov_G-#vspE*Y(h$Anm&DIc5Ou-F)jsl$PdOyj5wG1&E!Z8"
+    }
+
     # default version assigned to requests with no specific version. this is not expected to change
     # as it keeps us backwards compatible.
     default_version: 1.5
@@ -29,11 +35,6 @@
         pool_connections: 512
     }
 
-    credentials {
-        access_key: ""
-        secret_key: ""
-    }
-
     auth {
         # When creating a request, if token will expire in less than this value, try to refresh the token
         token_expiration_threshold_sec = 360
diff --git a/trains/backend_api/session/session.py b/trains/backend_api/session/session.py
index 901e429e..1e267d83 100644
--- a/trains/backend_api/session/session.py
+++ b/trains/backend_api/session/session.py
@@ -91,8 +91,7 @@ class Session(TokenManager):
         self._logger = logger
 
         self.__access_key = api_key or ENV_ACCESS_KEY.get(
-            default=(self.config.get("api.credentials.access_key", None) or
-                     "EGRTCO8JMSIGI6S39GTP43NFWXDQOW")
+            default=self.config.get("api.credentials.access_key", None)
         )
         if not self.access_key:
             raise ValueError(
@@ -100,8 +99,7 @@ class Session(TokenManager):
             )
 
         self.__secret_key = secret_key or ENV_SECRET_KEY.get(
-            default=(self.config.get("api.credentials.secret_key", None) or
-                     "x!XTov_G-#vspE*Y(h$Anm&DIc5Ou-F)jsl$PdOyj5wG1&E!Z8")
+            default=self.config.get("api.credentials.secret_key", None)
         )
         if not self.secret_key:
             raise ValueError(