diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d69e8771..6b65b334 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,20 +1,5 @@
 <template>
-  <div id="root" v-if="maintenance">
-    <Nav :maintenance="maintenance" />
-    <div class="hero is-fullheight-with-navbar">
-      <div class="hero-body">
-        <div class="container has-text-centered">
-          <h1 class="title is-1">
-            Savage <span class="has-text-danger">Aim</span> Maintenance
-          </h1>
-          <p class="subtitle">
-            We're currently undergoing maintenance. We should be back soon!
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div id="root" v-else>
+  <div id="root">
     <Nav />
     <div class="container is-fluid">
       <router-view ref="viewComponent"></router-view>
@@ -41,6 +26,20 @@ import SavageAimMixin from '@/mixins/savage_aim_mixin'
 export default class App extends Vue {
   updateSocket!: WebSocket
 
+  // Check that the backend server is up before loading the App properly
+  async checkBackend(): Promise<void> {
+    const response = await fetch('/backend/health/')
+    if (response.ok) {
+      this.loadData()
+      Vue.nextTick(() => this.$forceUpdate)
+      return
+    }
+
+    // If the request fails, it's almost guaranteed that the server is down, so ping a warning and set a check again in 30 seconds
+    this.$notify({ text: 'Backend server could not be reached. There is probably an update being deployed. Checking again in 30 seconds.', type: 'is-warning' })
+    setTimeout(this.checkBackend, 30 * 1000)
+  }
+
   // Check the current version against the last version the user has seen, and if there's anything new, display the CHANGELOG modal
   checkChangelog(): void {
     const lastVersion = localStorage.lastVersion || ''
@@ -52,20 +51,17 @@ export default class App extends Vue {
     }
   }
 
-  get maintenance(): boolean {
-    if (process.env.VUE_APP_MAINTENANCE !== undefined) {
-      return process.env.VUE_APP_MAINTENANCE === '1'
-    }
-    return false
-  }
-
   get viewComponent(): SavageAimMixin {
     return this.$refs.viewComponent as SavageAimMixin
   }
 
   async mounted(): Promise<void> {
-    if (this.maintenance) return
+    this.checkBackend()
+  }
+
+  loadData(): void {
     // Populate the store with static information for dropdowns later
+    this.$store.dispatch('fetchUser')
     this.$store.dispatch('fetchGear')
     this.$store.dispatch('fetchItemLevels')
     this.$store.dispatch('fetchJobs')
diff --git a/frontend/src/components/modals/changelog.vue b/frontend/src/components/modals/changelog.vue
index 4c8ff386..43bd6dec 100644
--- a/frontend/src/components/modals/changelog.vue
+++ b/frontend/src/components/modals/changelog.vue
@@ -13,6 +13,7 @@
     <div class="card-content content">
       <h2 class="has-text-primary subtitle">{{ version }}</h2>
       <div class="divider"><i class="material-icons icon">expand_more</i> Major Changes <i class="material-icons icon">expand_more</i></div>
+      <p>Added handling to detect if the backend is up and responding before loading data, to prevent random errors during deployments.</p>
       <p>
         Added a new "Update" button on Character pages to refresh Character data from the Lodestone.
         <ul>
diff --git a/frontend/src/components/nav.vue b/frontend/src/components/nav.vue
index af08509e..257f8959 100644
--- a/frontend/src/components/nav.vue
+++ b/frontend/src/components/nav.vue
@@ -14,7 +14,7 @@
       </a>
     </div>
 
-    <div ref="navbar" class="navbar-menu" v-if="!maintenance">
+    <div ref="navbar" class="navbar-menu">
       <div class="navbar-start">
         <router-link to="/" class="navbar-item">
           <div class="icon-text">
@@ -97,9 +97,6 @@ import NotificationsModal from './modals/notifications.vue'
 
 @Component
 export default class Nav extends SavageAimMixin {
-  @Prop({ default: false })
-  maintenance!: boolean
-
   // Only check for the refs after we've been mounted
   isMounted = false
 
diff --git a/frontend/src/store.ts b/frontend/src/store.ts
index 03542f57..e3c5ad0c 100644
--- a/frontend/src/store.ts
+++ b/frontend/src/store.ts
@@ -181,7 +181,7 @@ const store: Store = {
           }
           commit('setUser', userDetails)
         }
-        else {
+        else if (response.status !== 502) {
           Vue.notify({ text: `Error ${response.status} when fetching User details.`, type: 'is-danger' })
         }
       }