diff --git a/frontend/farm_designer/farm_events/__tests__/edit_fe_form_test.tsx b/frontend/farm_designer/farm_events/__tests__/edit_fe_form_test.tsx
index b0adea962..ff37f8017 100644
--- a/frontend/farm_designer/farm_events/__tests__/edit_fe_form_test.tsx
+++ b/frontend/farm_designer/farm_events/__tests__/edit_fe_form_test.tsx
@@ -223,7 +223,7 @@ describe("<EditFEForm />", () => {
       ]}
       findExecutable={jest.fn(() => seq)}
       dispatch={jest.fn()}
-      repeatOptions={repeatOptions}
+      repeatOptions={repeatOptions()}
       timeSettings={fakeTimeSettings()}
       autoSyncEnabled={false}
       resources={buildResourceIndex([]).index}
diff --git a/frontend/farm_designer/farm_events/farm_event_repeat_form.tsx b/frontend/farm_designer/farm_events/farm_event_repeat_form.tsx
index c7e3d24b5..e3dde270f 100644
--- a/frontend/farm_designer/farm_events/farm_event_repeat_form.tsx
+++ b/frontend/farm_designer/farm_events/farm_event_repeat_form.tsx
@@ -26,7 +26,7 @@ export interface FarmEventRepeatFormProps {
 }
 
 const indexKey: keyof DropDownItem = "value";
-const OPTN_LOOKUP = keyBy(repeatOptions, indexKey);
+const OPTN_LOOKUP = () => keyBy(repeatOptions(), indexKey);
 
 export function FarmEventRepeatForm(props: FarmEventRepeatFormProps) {
   const { disabled, fieldSet, repeat, endDate, endTime, timeUnit } = props;
@@ -50,9 +50,9 @@ export function FarmEventRepeatForm(props: FarmEventRepeatFormProps) {
         </Col>
         <Col xs={8}>
           <FBSelect
-            list={repeatOptions}
+            list={repeatOptions()}
             onChange={ddi => fieldSet("timeUnit", "" + ddi.value)}
-            selectedItem={OPTN_LOOKUP[timeUnit] || OPTN_LOOKUP["daily"]} />
+            selectedItem={OPTN_LOOKUP()[timeUnit] || OPTN_LOOKUP()["daily"]} />
         </Col>
       </Row>
       <label>
diff --git a/frontend/farm_designer/farm_events/map_state_to_props_add_edit.ts b/frontend/farm_designer/farm_events/map_state_to_props_add_edit.ts
index 605509421..162be3afd 100644
--- a/frontend/farm_designer/farm_events/map_state_to_props_add_edit.ts
+++ b/frontend/farm_designer/farm_events/map_state_to_props_add_edit.ts
@@ -41,7 +41,7 @@ export const formatDate = (input: string, timeSettings: TimeSettings) => {
   return moment(iso).utcOffset(timeSettings.utcOffset).format("YYYY-MM-DD");
 };
 
-export const repeatOptions = [
+export const repeatOptions = () => [
   { label: t("Minutes"), value: "minutely", name: "time_unit" },
   { label: t("Hours"), value: "hourly", name: "time_unit" },
   { label: t("Days"), value: "daily", name: "time_unit" },
@@ -147,7 +147,7 @@ export function mapStateToPropsAddEdit(props: Everything): AddEditFarmEventProps
     sequencesById,
     farmEventsById,
     executableOptions: executableList,
-    repeatOptions,
+    repeatOptions: repeatOptions(),
     handleTime,
     farmEvents,
     getFarmEvent,
diff --git a/frontend/sequences/step_tiles/tile_assertion.tsx b/frontend/sequences/step_tiles/tile_assertion.tsx
index 583b8bbfc..53371acf9 100644
--- a/frontend/sequences/step_tiles/tile_assertion.tsx
+++ b/frontend/sequences/step_tiles/tile_assertion.tsx
@@ -38,10 +38,10 @@ export function TileAssertion(props: StepParams) {
       </Row>
       <Row>
         <Col xs={6}>
-          <TypePart {...p} />
+          <TypePart key={JSON.stringify(props.currentSequence)} {...p} />
         </Col>
         <Col xs={6}>
-          <SequencePart {...p} />
+          <SequencePart key={JSON.stringify(props.currentSequence)} {...p} />
         </Col>
       </Row>
     </StepContent>