diff --git a/src/common/MenuLayout.tsx b/src/common/MenuLayout.tsx
index b87010f0..697b3830 100644
--- a/src/common/MenuLayout.tsx
+++ b/src/common/MenuLayout.tsx
@@ -1,5 +1,5 @@
 import { FC, useEffect } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Redirect, Route, Switch } from 'react-router-dom';
 import { useSwipeable } from 'react-swipeable';
 import { faBars as burgerIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -61,6 +61,7 @@ const MenuLayout = (
           <div className="col-lg-10 offset-lg-2 col-md-9 offset-md-3" onClick={() => hideSidebar()}>
             <div className="menu-layout__container">
               <Switch>
+                <Redirect exact from="/server/:serverId" to="/server/:serverId/overview" />
                 <Route exact path="/server/:serverId/overview" component={Overview} />
                 <Route exact path="/server/:serverId/list-short-urls/:page" component={ShortUrls} />
                 <Route exact path="/server/:serverId/create-short-url" component={CreateShortUrl} />
diff --git a/src/servers/CreateServer.tsx b/src/servers/CreateServer.tsx
index d17621d3..ab0e2d5c 100644
--- a/src/servers/CreateServer.tsx
+++ b/src/servers/CreateServer.tsx
@@ -39,7 +39,7 @@ const CreateServer = (ImportServersBtn: FC<ImportServersBtnProps>, useStateFlagT
     const id = uuid();
 
     createServer({ ...serverData, id });
-    push(`/server/${id}/overview`);
+    push(`/server/${id}`);
   };
 
   return (
diff --git a/src/servers/EditServer.tsx b/src/servers/EditServer.tsx
index 1b1db461..d8871748 100644
--- a/src/servers/EditServer.tsx
+++ b/src/servers/EditServer.tsx
@@ -18,7 +18,7 @@ export const EditServer = (ServerError: FC) => withSelectedServer<EditServerProp
 
   const handleSubmit = (serverData: ServerData) => {
     editServer(selectedServer.id, serverData);
-    push(`/server/${selectedServer.id}/overview`);
+    push(`/server/${selectedServer.id}`);
   };
 
   return (
diff --git a/src/servers/ServersDropdown.tsx b/src/servers/ServersDropdown.tsx
index 67f0d97f..a787c467 100644
--- a/src/servers/ServersDropdown.tsx
+++ b/src/servers/ServersDropdown.tsx
@@ -23,7 +23,7 @@ const ServersDropdown = (serversExporter: ServersExporter) => ({ servers, select
           <DropdownItem
             key={id}
             tag={Link}
-            to={`/server/${id}/overview`}
+            to={`/server/${id}`}
             active={isServerWithId(selectedServer) && selectedServer.id === id}
           >
             {name}
diff --git a/src/servers/ServersListGroup.tsx b/src/servers/ServersListGroup.tsx
index d96e0762..ec0f1454 100644
--- a/src/servers/ServersListGroup.tsx
+++ b/src/servers/ServersListGroup.tsx
@@ -11,7 +11,7 @@ interface ServersListGroup {
 }
 
 const ServerListItem = ({ id, name }: { id: string; name: string }) => (
-  <ListGroupItem tag={Link} to={`/server/${id}/overview`} className="servers-list__server-item">
+  <ListGroupItem tag={Link} to={`/server/${id}`} className="servers-list__server-item">
     {name}
     <FontAwesomeIcon icon={chevronIcon} className="servers-list__server-item-icon" />
   </ListGroupItem>