diff --git a/lib/actions/entry-actions.js b/lib/actions/entry-actions.js
--- a/lib/actions/entry-actions.js
+++ b/lib/actions/entry-actions.js
@@ -65,6 +65,7 @@
 export type UpdateCalendarQueryInput = {
   +calendarQuery: CalendarQuery,
   +reduxAlreadyUpdated?: boolean,
+  +keyserverIDs?: $ReadOnlyArray<string>,
 };
 
 const updateCalendarQueryActionTypes = Object.freeze({
@@ -82,13 +83,15 @@
   async input => {
     const { calendarQuery, reduxAlreadyUpdated = false } = input;
 
+    const keyserverIDs = input.keyserverIDs ?? allKeyserverIDs;
+
     const calendarQueries = sortCalendarQueryPerKeyserver(
       calendarQuery,
-      allKeyserverIDs,
+      keyserverIDs,
     );
 
     const requests: { [string]: CalendarQuery } = {};
-    for (const keyserverID of allKeyserverIDs) {
+    for (const keyserverID of keyserverIDs) {
       requests[keyserverID] = calendarQueries[keyserverID];
     }
 
@@ -111,6 +114,7 @@
       deletedEntryIDs,
       calendarQuery,
       calendarQueryAlreadyUpdated: reduxAlreadyUpdated,
+      keyserverIDs,
     };
   };
 
diff --git a/lib/types/entry-types.js b/lib/types/entry-types.js
--- a/lib/types/entry-types.js
+++ b/lib/types/entry-types.js
@@ -246,6 +246,7 @@
   +deletedEntryIDs: $ReadOnlyArray<string>,
   +calendarQuery: CalendarQuery,
   +calendarQueryAlreadyUpdated: boolean,
+  +keyserverIDs: $ReadOnlyArray<string>,
 };
 
 export type FetchRevisionsForEntryPayload = {