diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js
index 7ad4c4bf3..50ca791cc 100644
--- a/src/common/routesRegexp.js
+++ b/src/common/routesRegexp.js
@@ -12,11 +12,11 @@ const compilePath = (path, options) => {
 const routesRegexp = {
     intro: compilePath('/intro'),
     board: compilePath('/'),
-    discover: compilePath('/discover(?:/(:type|)(?:/(:catalog|))?)?'),
-    library: compilePath('/library(?:/(:type|)(?:/(:sort|))?)?'),
+    discover: compilePath('/discover/:type?/:catalog?'),
+    library: compilePath('/library/:sort?'),
     calendar: compilePath('/calendar'),
     search: compilePath('/search'),
-    detail: compilePath('/detail/:type/:id/:videoId'),
+    detail: compilePath('/detail/:type/:id/:videoId?'),
     addons: compilePath('/addons'),
     settings: compilePath('/settings'),
     player: compilePath('/player')