diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx
index cf728b71b..df32388a6 100644
--- a/ui/component/router/view.jsx
+++ b/ui/component/router/view.jsx
@@ -131,7 +131,7 @@ function AppRouter(props: Props) {
   // react-router doesn't decode pathanmes before doing the route matching check
   // We have to redirect here because if we redirect on the server, it might get encoded again
   // in the browser causing a redirect loop
-  const decodedUrl = decodeURIComponent(pathname + search);
+  const decodedUrl = decodeURIComponent(pathname) + search;
   if (decodedUrl !== pathname + search) {
     return <Redirect to={decodedUrl} />;
   }