diff --git a/lib/socket/calendar-query-handler.react.js b/lib/socket/calendar-query-handler.react.js
--- a/lib/socket/calendar-query-handler.react.js
+++ b/lib/socket/calendar-query-handler.react.js
@@ -44,7 +44,6 @@
 };
 class CalendarQueryHandler extends React.PureComponent<Props> {
   serverCalendarQuery: CalendarQuery;
-  expirationTimeoutID: ?TimeoutID;
 
   constructor(props: Props) {
     super(props);
@@ -115,6 +114,7 @@
       this.props.updateCalendarQuery({
         calendarQuery,
         reduxAlreadyUpdated: true,
+        keyserverIDs: [this.props.keyserverID],
       }),
       undefined,
       ({ calendarQuery }: CalendarQueryUpdateStartingPayload),