diff --git a/html/src/index.pug b/html/src/index.pug
index 6e4f48c1..4b59b29c 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -509,7 +509,7 @@ html
                     div(style="font-size:12px;margin-top:5px")
                         span(style="display:inline-block;min-width:150px") Minimal Feed Icons
                         el-switch(v-model="minimalFeed" :disabled="!openVR")
-                    div(style="font-size:12px;margin-top:5px" :disabled="!openVR")
+                    div(style="font-size:12px;margin-top:5px")
                         span(style="display:inline-block;min-width:150px") Overlay Notifications
                         el-switch(v-model="overlayNotifications" :disabled="!openVR")
                     div(style="font-size:12px;margin-top:5px")
diff --git a/html/src/vr.js b/html/src/vr.js
index 59085f49..9c0989da 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -677,8 +677,7 @@ import webApiService from './service/webapi.js';
                         map[feed.displayName] < feed.created_at) {
                         map[feed.displayName] = feed.created_at;
                     }
-                }
-                if (feed.type === 'invite' ||
+                } else if (feed.type === 'invite' ||
                     feed.type === 'requestInvite' ||
                     feed.type === 'friendRequest') {
                     if (!map[feed.senderUsername] ||
@@ -704,8 +703,7 @@ import webApiService from './service/webapi.js';
                                 notys.push(feed);
                             }
                         }
-                    }
-                    if ((notificationJoinLeaveFilter === "Everyone") ||
+                    } else if ((notificationJoinLeaveFilter === "Everyone") ||
                         ((notificationJoinLeaveFilter === "Friends") && (feed.isFriend)) ||
                         ((notificationJoinLeaveFilter === "VIP") && (feed.isFavorite))) {
                         if (feed.type === 'OnPlayerJoined' ||
@@ -716,8 +714,7 @@ import webApiService from './service/webapi.js';
                                 notys.push(feed);
                             }
                         }
-                    }
-                    if (feed.type === 'invite' ||
+                    } else if (feed.type === 'invite' ||
                         feed.type === 'requestInvite' ||
                         feed.type === 'friendRequest') {
                         if (!map[feed.senderUsername] ||