diff --git a/keyserver/src/responders/redux-state-responders.js b/keyserver/src/responders/redux-state-responders.js
--- a/keyserver/src/responders/redux-state-responders.js
+++ b/keyserver/src/responders/redux-state-responders.js
@@ -167,7 +167,12 @@
     const { messageStore: freshStore } = freshMessageStore(
       rawMessageInfos,
       truncationStatuses,
-      mostRecentMessageTimestamp(rawMessageInfos, initialTime),
+      {
+        [ashoatKeyserverID]: mostRecentMessageTimestamp(
+          rawMessageInfos,
+          initialTime,
+        ),
+      },
       threadInfos,
     );
     return freshStore;
diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js
--- a/lib/reducers/message-reducer.js
+++ b/lib/reducers/message-reducer.js
@@ -145,7 +145,7 @@
 function freshMessageStore(
   messageInfos: $ReadOnlyArray<RawMessageInfo>,
   truncationStatus: { [threadID: string]: MessageTruncationStatus },
-  currentAsOf: number,
+  currentAsOf: { +[keyserverID: string]: number },
   threadInfos: RawThreadInfos,
 ): FreshMessageStoreResult {
   const unshimmed = unshimMessageInfos(messageInfos);
@@ -199,7 +199,7 @@
       messages,
       threads,
       local: {},
-      currentAsOf: { [ashoatKeyserverID]: currentAsOf },
+      currentAsOf,
     },
   };
 }
@@ -722,7 +722,7 @@
       freshMessageStore(
         messagesResult.messageInfos,
         messagesResult.truncationStatus,
-        messagesResult.currentAsOf[ashoatKeyserverID],
+        messagesResult.currentAsOf,
         newThreadInfos,
       );