diff --git a/lib/reducers/calendar-filters-reducer.js b/lib/reducers/calendar-filters-reducer.js
--- a/lib/reducers/calendar-filters-reducer.js
+++ b/lib/reducers/calendar-filters-reducer.js
@@ -60,11 +60,16 @@
     action.type === deleteAccountActionTypes.success ||
     action.type === logInActionTypes.success ||
     action.type === siweAuthActionTypes.success ||
-    action.type === keyserverRegisterActionTypes.success ||
-    (action.type === setNewSessionActionType &&
-      action.payload.sessionChange.cookieInvalidated)
+    action.type === keyserverRegisterActionTypes.success
   ) {
     return defaultCalendarFilters;
+  } else if (
+    action.type === setNewSessionActionType &&
+    action.payload.sessionChange.cookieInvalidated
+  ) {
+    return removeKeyserverThreadIDsFromFilterList(state, [
+      action.payload.keyserverID,
+    ]);
   } else if (action.type === deleteKeyserverAccountActionTypes.success) {
     return removeKeyserverThreadIDsFromFilterList(
       state,
diff --git a/lib/reducers/calendar-query-reducer.js b/lib/reducers/calendar-query-reducer.js
--- a/lib/reducers/calendar-query-reducer.js
+++ b/lib/reducers/calendar-query-reducer.js
@@ -26,11 +26,19 @@
 ): CalendarQuery {
   if (
     action.type === logOutActionTypes.success ||
-    action.type === deleteAccountActionTypes.success ||
-    (action.type === setNewSessionActionType &&
-      action.payload.sessionChange.cookieInvalidated)
+    action.type === deleteAccountActionTypes.success
   ) {
     return defaultCalendarQuery(getConfig().platformDetails.platform);
+  } else if (
+    action.type === setNewSessionActionType &&
+    action.payload.sessionChange.cookieInvalidated
+  ) {
+    return {
+      ...state,
+      filters: removeKeyserverThreadIDsFromFilterList(state.filters, [
+        action.payload.keyserverID,
+      ]),
+    };
   } else if (action.type === deleteKeyserverAccountActionTypes.success) {
     return {
       ...state,