diff --git a/resources/scripts/api/server/getServer.ts b/resources/scripts/api/server/getServer.ts
index 95fda0ddc..3521ed0da 100644
--- a/resources/scripts/api/server/getServer.ts
+++ b/resources/scripts/api/server/getServer.ts
@@ -13,7 +13,7 @@ export interface Allocation {
 
 export interface Server {
     id: string;
-    internalId: number;
+    internalId: number | string;
     uuid: string;
     name: string;
     node: string;
diff --git a/resources/scripts/components/App.tsx b/resources/scripts/components/App.tsx
index 350387fac..f61e73e0b 100644
--- a/resources/scripts/components/App.tsx
+++ b/resources/scripts/components/App.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga';
 import { hot } from 'react-hot-loader/root';
-import { BrowserRouter, Route, Switch } from 'react-router-dom';
+import { BrowserRouter, Route, Switch, useLocation } from 'react-router-dom';
 import { StoreProvider } from 'easy-peasy';
 import { store } from '@/state';
 import DashboardRouter from '@/routers/DashboardRouter';
@@ -30,6 +30,16 @@ interface ExtendedWindow extends Window {
     };
 }
 
+const Pageview = () => {
+    const { pathname } = useLocation();
+
+    useEffect(() => {
+        ReactGA.pageview(pathname);
+    }, [ pathname ]);
+
+    return null;
+};
+
 const App = () => {
     const { PterodactylUser, SiteConfiguration } = (window as ExtendedWindow);
     if (PterodactylUser && !store.getState().user.data) {
@@ -50,8 +60,9 @@ const App = () => {
     }
 
     useEffect(() => {
-        ReactGA.initialize(SiteConfiguration!.analytics);
-        ReactGA.pageview(location.pathname);
+        if (SiteConfiguration?.analytics) {
+            ReactGA.initialize(SiteConfiguration!.analytics);
+        }
     }, []);
 
     return (
@@ -62,6 +73,7 @@ const App = () => {
                     <ProgressBar/>
                     <div css={tw`mx-auto w-auto`}>
                         <BrowserRouter basename={'/'} key={'root-router'}>
+                            {SiteConfiguration?.analytics && <Pageview/>}
                             <Switch>
                                 <Route path="/server/:id" component={ServerRouter}/>
                                 <Route path="/auth" component={AuthenticationRouter}/>
diff --git a/resources/scripts/routers/AuthenticationRouter.tsx b/resources/scripts/routers/AuthenticationRouter.tsx
index 57d1422ca..a7c687eef 100644
--- a/resources/scripts/routers/AuthenticationRouter.tsx
+++ b/resources/scripts/routers/AuthenticationRouter.tsx
@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
-import ReactGA from 'react-ga';
+import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 import LoginContainer from '@/components/auth/LoginContainer';
 import ForgotPasswordContainer from '@/components/auth/ForgotPasswordContainer';
@@ -7,23 +6,17 @@ import ResetPasswordContainer from '@/components/auth/ResetPasswordContainer';
 import LoginCheckpointContainer from '@/components/auth/LoginCheckpointContainer';
 import NotFound from '@/components/screens/NotFound';
 
-export default ({ location, history, match }: RouteComponentProps) => {
-    useEffect(() => {
-        ReactGA.pageview(location.pathname);
-    }, [ location.pathname ]);
-
-    return (
-        <div className={'pt-8 xl:pt-32'}>
-            <Switch location={location}>
-                <Route path={`${match.path}/login`} component={LoginContainer} exact/>
-                <Route path={`${match.path}/login/checkpoint`} component={LoginCheckpointContainer}/>
-                <Route path={`${match.path}/password`} component={ForgotPasswordContainer} exact/>
-                <Route path={`${match.path}/password/reset/:token`} component={ResetPasswordContainer}/>
-                <Route path={`${match.path}/checkpoint`} />
-                <Route path={'*'}>
-                    <NotFound onBack={() => history.push('/auth/login')} />
-                </Route>
-            </Switch>
-        </div>
-    );
-};
+export default ({ location, history, match }: RouteComponentProps) => (
+    <div className={'pt-8 xl:pt-32'}>
+        <Switch location={location}>
+            <Route path={`${match.path}/login`} component={LoginContainer} exact/>
+            <Route path={`${match.path}/login/checkpoint`} component={LoginCheckpointContainer}/>
+            <Route path={`${match.path}/password`} component={ForgotPasswordContainer} exact/>
+            <Route path={`${match.path}/password/reset/:token`} component={ResetPasswordContainer}/>
+            <Route path={`${match.path}/checkpoint`}/>
+            <Route path={'*'}>
+                <NotFound onBack={() => history.push('/auth/login')}/>
+            </Route>
+        </Switch>
+    </div>
+);
diff --git a/resources/scripts/routers/DashboardRouter.tsx b/resources/scripts/routers/DashboardRouter.tsx
index 7a895a7e4..1e5963996 100644
--- a/resources/scripts/routers/DashboardRouter.tsx
+++ b/resources/scripts/routers/DashboardRouter.tsx
@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
-import ReactGA from 'react-ga';
+import React from 'react';
 import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import AccountOverviewContainer from '@/components/dashboard/AccountOverviewContainer';
 import NavigationBar from '@/components/NavigationBar';
@@ -9,30 +8,24 @@ import NotFound from '@/components/screens/NotFound';
 import TransitionRouter from '@/TransitionRouter';
 import SubNavigation from '@/components/elements/SubNavigation';
 
-export default ({ location }: RouteComponentProps) => {
-    useEffect(() => {
-        ReactGA.pageview(location.pathname);
-    }, [ location.pathname ]);
-
-    return (
-        <>
-            <NavigationBar />
-            {location.pathname.startsWith('/account') &&
-                <SubNavigation>
-                    <div>
-                        <NavLink to={'/account'} exact>Settings</NavLink>
-                        <NavLink to={'/account/api'}>API Credentials</NavLink>
-                    </div>
-                </SubNavigation>
-            }
-            <TransitionRouter>
-                <Switch location={location}>
-                    <Route path={'/'} component={DashboardContainer} exact />
-                    <Route path={'/account'} component={AccountOverviewContainer} exact/>
-                    <Route path={'/account/api'} component={AccountApiContainer} exact/>
-                    <Route path={'*'} component={NotFound} />
-                </Switch>
-            </TransitionRouter>
-        </>
-    );
-};
+export default ({ location }: RouteComponentProps) => (
+    <>
+        <NavigationBar/>
+        {location.pathname.startsWith('/account') &&
+        <SubNavigation>
+            <div>
+                <NavLink to={'/account'} exact>Settings</NavLink>
+                <NavLink to={'/account/api'}>API Credentials</NavLink>
+            </div>
+        </SubNavigation>
+        }
+        <TransitionRouter>
+            <Switch location={location}>
+                <Route path={'/'} component={DashboardContainer} exact/>
+                <Route path={'/account'} component={AccountOverviewContainer} exact/>
+                <Route path={'/account/api'} component={AccountApiContainer} exact/>
+                <Route path={'*'} component={NotFound}/>
+            </Switch>
+        </TransitionRouter>
+    </>
+);
diff --git a/resources/scripts/routers/ServerRouter.tsx b/resources/scripts/routers/ServerRouter.tsx
index 01c5ac07e..0a09774aa 100644
--- a/resources/scripts/routers/ServerRouter.tsx
+++ b/resources/scripts/routers/ServerRouter.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import ReactGA from 'react-ga';
 import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import NavigationBar from '@/components/NavigationBar';
 import ServerConsole from '@/components/server/ServerConsole';
@@ -40,9 +39,9 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
     const id = ServerContext.useStoreState(state => state.server.data?.id);
     const uuid = ServerContext.useStoreState(state => state.server.data?.uuid);
     const isInstalling = ServerContext.useStoreState(state => state.server.data?.isInstalling);
+    const serverId = ServerContext.useStoreState(state => state.server.data?.internalId);
     const getServer = ServerContext.useStoreActions(actions => actions.server.getServer);
     const clearServerState = ServerContext.useStoreActions(actions => actions.clearServerState);
-    const serverId = ServerContext.useStoreState(state => state.server.data?.internalId);
 
     useEffect(() => () => {
         clearServerState();
@@ -70,10 +69,6 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
         };
     }, [ match.params.id ]);
 
-    useEffect(() => {
-        ReactGA.pageview(location.pathname);
-    }, [ location.pathname ]);
-
     return (
         <React.Fragment key={'server-router'}>
             <NavigationBar/>
@@ -113,9 +108,9 @@ const ServerRouter = ({ match, location }: RouteComponentProps<{ id: string }>)
                                     <NavLink to={`${match.url}/settings`}>Settings</NavLink>
                                 </Can>
                                 {rootAdmin &&
-                                    <a href={'/admin/servers/view/' + serverId} rel="noreferrer" target={'_blank'}>
-                                        <FontAwesomeIcon icon={faExternalLinkAlt}/>
-                                    </a>
+                                <a href={'/admin/servers/view/' + serverId} rel="noreferrer" target={'_blank'}>
+                                    <FontAwesomeIcon icon={faExternalLinkAlt}/>
+                                </a>
                                 }
                             </div>
                         </SubNavigation>