diff --git a/embark-ui/src/containers/AppContainer.js b/embark-ui/src/containers/AppContainer.js
index 88e499c1d..314684a0e 100644
--- a/embark-ui/src/containers/AppContainer.js
+++ b/embark-ui/src/containers/AppContainer.js
@@ -46,10 +46,8 @@ class AppContainer extends Component {
   }
 
   componentDidUpdate(){
-    if (this.requireAuthentication()) {
-      if (!this.queryStringAuthenticate()) {
-        this.props.authenticate(this.props.credentials.host, this.props.credentials.token);
-      }
+    if (!this.queryStringAuthenticate() && this.requireAuthentication()) {
+      this.props.authenticate(this.props.credentials.host, this.props.credentials.token);
     }
 
     if (this.props.credentials.authenticated && !this.props.initialized) {