diff --git a/lib/RouterMixin.js b/lib/RouterMixin.js
index <HASH>..<HASH> 100644
--- a/lib/RouterMixin.js
+++ b/lib/RouterMixin.js
@@ -153,10 +153,10 @@ function getInitialPath(component) {
     if (!path && detect.canUseDOM) {
         url = urllite(window.location.href);
 
-        if (!component.props.useHistory && url.hash) {
-            path = urllite(url.hash.slice(2)).pathname;
-        } else {
+        if (component.props.useHistory) {
             path = url.pathname;
+        } else if (url.hash) {
+            path = urllite(url.hash.slice(2)).pathname;
         }
     }
fix getInitialPath to get correct path while hash is null