diff --git a/templates/footer.html b/templates/footer.html
index fdc987ce..ed994c53 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -57,7 +57,8 @@
       notifications: [],
       page: 0,
       loading: true,
-      canLoadMore: true
+      canLoadMore: false,
+      showNotification: false,
     },
     computed: {
       has_non_read_notification: function () {
@@ -94,8 +95,8 @@
         });
         if (res.ok) {
           let json = await res.json();
-          if (json.length == 0) that.canLoadMore = false;
-          that.notifications = that.notifications.concat(json);
+          that.canLoadMore = json.more;
+          that.notifications = that.notifications.concat(json.notifications);
         }
       }
 
@@ -110,8 +111,11 @@
       });
       if (res.ok) {
         let json = await res.json();
-        that.notifications = json;
+        that.notifications = json.notifications;
         that.loading = false;
+        that.canLoadMore = json.more
+        if (that.notifications.length > 0)
+          that.showNotification = true;
       }
     }
   })
diff --git a/templates/header.html b/templates/header.html
index 84e18f32..667ab045 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -15,7 +15,8 @@
           </div>
         {% endif %}
 
-        <div id="notification-app" class="dropdown d-none d-md-flex">
+
+        <div id="notification-app" class="dropdown d-none d-md-flex" v-if="showNotification">
           <a class="nav-link icon" data-toggle="collapse" href="#notifications" style="height: 100%">
             <i class="fe fe-bell"></i>
             <span v-if="has_non_read_notification" class="nav-unread"></span>