diff --git a/client/history-saga.js b/client/history-saga.js
index 25e65340b9..f73576d394 100644
--- a/client/history-saga.js
+++ b/client/history-saga.js
@@ -35,7 +35,7 @@ export default function historySaga(
       }
 
       // store location has changed, update history
-      if (location.key !== prevKey) {
+      if (!location.key || location.key !== prevKey) {
         isSyncing = true;
         history.transitionTo({ ...emptyLocation, ...location });
         isSyncing = false;
diff --git a/client/index.js b/client/index.js
index ceaeb012ed..5089d27322 100644
--- a/client/index.js
+++ b/client/index.js
@@ -51,9 +51,7 @@ app$({ history, location: appLocation })
 
     const routerState$ = appStore$
       .map(({ location }) => location)
-      .distinctUntilChanged(
-        location => location && location.key ? location.key : location
-      );
+      .filter(location => !!location);
 
     // set page title
     appStore$