diff --git a/src/app/routerConfig.js b/src/app/routerConfig.js
index 01e20163b..4c7fcefd1 100644
--- a/src/app/routerConfig.js
+++ b/src/app/routerConfig.js
@@ -5,12 +5,12 @@ const config = {
         {
             routes: [
                 {
-                    path: '/calendar',
-                    component: Calendar
+                    path: '/',
+                    component: Board
                 },
                 {
-                    path: '/board',
-                    component: Board
+                    path: '/calendar',
+                    component: Calendar
                 }
             ]
         },
diff --git a/src/common/Router/Router.js b/src/common/Router/Router.js
index 8e24aefe5..e85843d89 100644
--- a/src/common/Router/Router.js
+++ b/src/common/Router/Router.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
-import { matchPath } from 'react-router-dom';
-import { join as joinPaths } from 'path';
+import pathToRegexp from 'path-to-regexp';
+import PathUtils from 'path';
 
 class Router extends Component {
     constructor(props) {
@@ -30,18 +30,24 @@ class Router extends Component {
     onLocationChanged = () => {
         const hashIndex = window.location.href.indexOf('#');
         const hashPath = hashIndex === -1 ? '' : window.location.href.substring(hashIndex + 1);
-        const path = joinPaths('/', hashPath);
+        const path = PathUtils.join('/', hashPath);
         if (hashPath !== path) {
             window.location.replace(`#${path}`);
             return;
         }
 
-        let pathMatched = false;
         for (let viewConfigIndex = 0; viewConfigIndex < this.props.config.views.length; viewConfigIndex++) {
             const viewConfig = this.props.config.views[viewConfigIndex];
             for (const routeConfig of viewConfig.routes) {
-                if (matchPath(path, routeConfig)) {
-                    pathMatched = true;
+                const keys = [];
+                const regexp = pathToRegexp(routeConfig.path, keys, {
+                    strict: false,
+                    sensitive: false,
+                    end: true,
+                    ...routeConfig.options
+                });
+                const match = regexp.exec(path);
+                if (match) {
                     this.setState(({ views }) => ({
                         views: views.map((view, viewIndex) => {
                             if (viewIndex > viewConfigIndex) {
@@ -64,9 +70,7 @@ class Router extends Component {
             }
         }
 
-        if (!pathMatched) {
-            window.location.replace('#/');
-        }
+        window.location.replace('#/');
     }
 
     render() {