diff --git a/src/components/docker-registry-ui.riot b/src/components/docker-registry-ui.riot
index cef00c9..6ae3820 100644
--- a/src/components/docker-registry-ui.riot
+++ b/src/components/docker-registry-ui.riot
@@ -117,7 +117,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
           });
         }
       },
-      baseRoute: '/(\\?[^#]*)?(#!)?(/?)',
+      baseRoute: '([^#]*?)/(\\?[^#]*?)?(#!)?(/?)',
       router,
       version
     }