diff --git a/src/app/app.js b/src/app/app.js
index 3de5f61b3..c5e9de3c7 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -1,19 +1,26 @@
 import React, { PureComponent } from 'react';
-import { HashRouter, Switch, Route, Redirect } from 'react-router-dom';
+import { Router, Switch, Route, Redirect } from 'react-router-dom';
+import { createHashHistory } from 'history';
 import { Main, Addons } from 'stremio-routes';
 import styles from './styles';
 
 class App extends PureComponent {
+    constructor(props) {
+        super(props);
+
+        this.history = createHashHistory();
+    }
+
     render() {
         return (
             <div className={styles['app']}>
-                <HashRouter>
+                <Router history={this.history}>
                     <Switch>
                         <Route path={'/(discover|library|calendar|search)?'} exact={true} component={Main} />
                         <Route path={'/addons'} component={Addons} />
                         <Redirect to={'/'} />
                     </Switch>
-                </HashRouter>
+                </Router>
             </div>
         );
     }