diff --git a/browser/app/js/App.js b/browser/app/js/App.js
index 5eeeaa734..9dd870849 100644
--- a/browser/app/js/App.js
+++ b/browser/app/js/App.js
@@ -19,28 +19,12 @@ import { Route, Switch, Redirect } from "react-router-dom"
 import Browser from "./browser/Browser"
 import Login from "./browser/Login"
 import web from "./web"
-import { minioBrowserPrefix } from "./constants"
-
-const AuthorizedRoute = ({ component: Component, ...rest }) => (
-  <Route
-    {...rest}
-    render={props =>
-      web.LoggedIn() ? (
-        <Component {...props} />
-      ) : (
-        <Redirect to={`${minioBrowserPrefix}/login`} />
-      )
-    }
-  />
-)
 
 export const App = () => {
   return (
     <Switch>
-      <AuthorizedRoute exact path={"/"} component={Browser} />
       <Route path={"/login"} component={Login} />
-      <Route path={"/:bucket/*"} component={Browser} />
-      <Route path={"/:bucket"} component={Browser} />
+      <Route path={"/:bucket?/*"} component={Browser} />
     </Switch>
   )
 }
diff --git a/browser/app/js/__tests__/App.test.js b/browser/app/js/__tests__/App.test.js
index 7548cbacd..842f4e145 100644
--- a/browser/app/js/__tests__/App.test.js
+++ b/browser/app/js/__tests__/App.test.js
@@ -15,11 +15,51 @@
  */
 
 import React from "react"
-import { shallow } from "enzyme"
+import { shallow, mount } from "enzyme"
+import { MemoryRouter } from "react-router-dom"
 import App from "../App"
 
+jest.mock("../browser/Login", () => () => <div>Login</div>)
+jest.mock("../browser/Browser", () => () => <div>Browser</div>)
+
 describe("App", () => {
   it("should render without crashing", () => {
-    shallow(<App match={ {url: "/minio"} }/>)
+    shallow(<App />)
+  })
+
+  it("should render Login component for '/login' route", () => {
+    const wrapper = mount(
+      <MemoryRouter initialEntries={["/login"]}>
+        <App />
+      </MemoryRouter>
+    )
+    expect(wrapper.text()).toBe("Login")
+  })
+
+  it("should render Browser component for '/' route", () => {
+    const wrapper = mount(
+      <MemoryRouter initialEntries={["/"]}>
+        <App />
+      </MemoryRouter>
+    )
+    expect(wrapper.text()).toBe("Browser")
+  })
+
+  it("should render Browser component for '/bucket' route", () => {
+    const wrapper = mount(
+      <MemoryRouter initialEntries={["/bucket"]}>
+        <App />
+      </MemoryRouter>
+    )
+    expect(wrapper.text()).toBe("Browser")
+  })
+
+  it("should render Browser component for '/bucket/a/b/c' route", () => {
+    const wrapper = mount(
+      <MemoryRouter initialEntries={["/bucket/a/b/c"]}>
+        <App />
+      </MemoryRouter>
+    )
+    expect(wrapper.text()).toBe("Browser")
   })
 })
diff --git a/browser/app/js/buckets/BucketList.js b/browser/app/js/buckets/BucketList.js
index 45e6cda14..76ff878c3 100644
--- a/browser/app/js/buckets/BucketList.js
+++ b/browser/app/js/buckets/BucketList.js
@@ -34,6 +34,8 @@ export class BucketList extends React.Component {
       if (bucket) {
         setBucketList([bucket])
         selectBucket(bucket, prefix)
+      } else {
+        history.replace("/login")
       }
     }
   }