diff --git a/src/App.js b/src/App.js
index d2d15aa08..90808d3ac 100644
--- a/src/App.js
+++ b/src/App.js
@@ -26,7 +26,7 @@ export default class StripesCore extends Component {
     const parsedTenant = storedTenant ? JSON.parse(storedTenant) : undefined;
 
     const okapi = (typeof okapiConfig === 'object' && Object.keys(okapiConfig).length > 0)
-      ? { ...okapiConfig, tenant: parsedTenant?.tenantName || okapiConfig.tenant, clientId: parsedTenant?.clientId } : { withoutOkapi: true };
+      ? { ...okapiConfig, tenant: parsedTenant?.tenantName || okapiConfig.tenant, clientId: parsedTenant?.clientId || okapiConfig.clientId  } : { withoutOkapi: true };
 
     const initialState = merge({}, { okapi }, props.initialState);