diff --git a/web/calendar/calendar.react.js b/web/calendar/calendar.react.js
--- a/web/calendar/calendar.react.js
+++ b/web/calendar/calendar.react.js
@@ -150,7 +150,6 @@
           <Day
             dayString={dayString}
             entryInfos={entries}
-            setModal={this.props.setModal}
             key={curDayOfMonth}
             startingTabIndex={tabIndex}
           />,
diff --git a/web/calendar/day.react.js b/web/calendar/day.react.js
--- a/web/calendar/day.react.js
+++ b/web/calendar/day.react.js
@@ -35,7 +35,6 @@
 type BaseProps = {
   +dayString: string,
   +entryInfos: $ReadOnlyArray<EntryInfo>,
-  +setModal: (modal: ?React.Node) => void,
   +startingTabIndex: number,
 };
 type Props = {
@@ -46,6 +45,8 @@
   +nextLocalID: number,
   +timeZone: ?string,
   +dispatch: Dispatch,
+  +clearModal: () => void,
+  +setModal: (modal: ?React.Node) => void,
 };
 type State = {
   +pickerOpen: boolean,
@@ -244,7 +245,7 @@
       <HistoryModal
         mode="day"
         dayString={this.props.dayString}
-        onClose={this.clearModal}
+        onClose={this.props.clearModal}
       />,
     );
   };
@@ -259,10 +260,6 @@
       entry.focus();
     }
   };
-
-  clearModal = () => {
-    this.props.setModal(null);
-  };
 }
 
 const ConnectedDay: React.ComponentType<BaseProps> = React.memo<BaseProps>(
@@ -289,6 +286,7 @@
         timeZone={timeZone}
         dispatch={dispatch}
         setModal={modalContext.setModal}
+        clearModal={modalContext.clearModal}
       />
     );
   },