diff --git a/src/message/messagesReducer.js b/src/message/messagesReducer.js
index c597c28d72e..85bf86b3ef2 100644
--- a/src/message/messagesReducer.js
+++ b/src/message/messagesReducer.js
@@ -148,6 +148,7 @@ export default (state: MessagesState = initialState, action: Action): MessagesSt
     case MESSAGE_FETCH_COMPLETE:
       return {
         ...state,
+        // $FlowFixMe - Flow bug; should resolve in #4245
         ...groupItemsById(
           action.messages.map(message =>
             omit(message, ['flags', 'match_content', 'match_subject']),
diff --git a/src/presence/presenceReducer.js b/src/presence/presenceReducer.js
index f66aeb36222..fc8247efe54 100644
--- a/src/presence/presenceReducer.js
+++ b/src/presence/presenceReducer.js
@@ -27,6 +27,7 @@ export default (state: PresenceState = initialState, action: Action): PresenceSt
     case PRESENCE_RESPONSE:
       return {
         ...state,
+        // $FlowFixMe - Flow bug; should resolve in #4245
         ...action.presence,
       };
 
@@ -43,8 +44,13 @@ export default (state: PresenceState = initialState, action: Action): PresenceSt
         ...state,
         [action.email]: {
           ...state[action.email],
+          // $FlowFixMe - Flow bug; should resolve in #4245
           ...action.presence,
-          aggregated: getAggregatedPresence({ ...state[action.email], ...action.presence }),
+          aggregated: getAggregatedPresence({
+            ...state[action.email],
+            // $FlowFixMe - Flow bug; should resolve in #4245
+            ...action.presence,
+          }),
         },
       };
     }