diff --git a/resources/assets/js/views/settings/UpdateApp.vue b/resources/assets/js/views/settings/UpdateApp.vue
index 8b9db1ea..b7511738 100644
--- a/resources/assets/js/views/settings/UpdateApp.vue
+++ b/resources/assets/js/views/settings/UpdateApp.vue
@@ -9,11 +9,11 @@
         <label class="input-label">Current version</label><br>
         <label class="version">1.0.0</label>
         <base-button :outline="true" size="large" color="theme" @click="checkUpdate">
-          <font-awesome-icon :class="{'update': isUpdateAvail}" style="margin-right: 5px;" icon="sync-alt" />
+          <font-awesome-icon :class="{'update': isUpdateAvail}" style="margin-right: 10px;" icon="sync-alt" />
           {{ $t('settings.update_app.check_update') }}
         </base-button>
         <hr>
-        <div v-if="isUpdateAvail" class="mt-4 content">
+        <div v-show="!isUpdating" v-if="isUpdateAvail" class="mt-4 content">
           <h3 class="page-title">{{ $t('settings.update_app.avail_update') }}</h3>
           <label class="input-label">{{ $t('settings.update_app.next_version') }}</label><br>
           <label class="version">{{ updateData.version }}</label>
@@ -66,15 +66,21 @@ export default {
       let response = await axios.post('/api/update', data)
       console.log(response.data)
       this.isUpdating = false
+      this.isUpdateAvail = false
     },
     async checkUpdate () {
-      this.isUpdateAvail = true
-      let response = await axios.get('/api/check/update')
-      console.log(response.data)
-      if (response.data) {
-        this.updateData.isMinor = response.data.is_minor
-        this.updateData.version = response.data.version.version
-        this.updateData.description = response.data.version.description
+      try {
+        let response = await axios.get('/api/check/update')
+        console.log(response.data)
+        if (response.data) {
+          this.updateData.isMinor = response.data.is_minor
+          this.updateData.version = response.data.version
+          this.description = response.data.description
+        }
+        this.isUpdateAvail = true
+      } catch (e) {
+        this.isUpdateAvail = false
+        window.toastr['error']('Something went wrong')
       }
     }
   }