diff --git a/src/app.js b/src/app.js
index ba2ecc0..bcaced0 100644
--- a/src/app.js
+++ b/src/app.js
@@ -48,11 +48,6 @@ class App extends React.Component {
     this.state = {
       showSidebarMenu: false,
     }
-
-    // load config from backend
-    AppDispatcher.dispatch({
-      type: 'config/load',
-    });
   }
 
   componentDidMount() {
diff --git a/src/user/login.js b/src/user/login.js
index 0ab4b28..a9814b1 100644
--- a/src/user/login.js
+++ b/src/user/login.js
@@ -26,6 +26,7 @@ import Header from '../common/header';
 import Footer from '../common/footer';
 import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
 import LoginStore from './login-store'
+import AppDispatcher from '../common/app-dispatcher';
 
 class Login extends Component {
 
@@ -36,11 +37,17 @@ class Login extends Component {
   static calculateState(prevState, props) {
     // We need to work with the login store here to trigger the re-render upon state change after login
     // Upon successful login, the token and currentUser are stored in the local storage as strings
+    const config = LoginStore.getState().config;
+    if (config === null) {
+      AppDispatcher.dispatch({
+        type: 'config/load',
+      });
+    }
     return {
       loginMessage: LoginStore.getState().loginMessage,
       token: LoginStore.getState().token,
       currentUser: LoginStore.getState().currentUser,
-      config: LoginStore.getState().config,
+      config: config,
     }
   }