diff --git a/src/plugins/timezones/components.tsx b/src/plugins/timezones/components.tsx
index 34079a5e0..b6df6f413 100644
--- a/src/plugins/timezones/components.tsx
+++ b/src/plugins/timezones/components.tsx
@@ -99,13 +99,8 @@ function LocalTimestampInner(props: LocalTimestampProps): JSX.Element | null {
                       className={classes}
                       onClick={() => {
                           toolTipProps.onClick();
-                          openModal(modalProps =>
-                              <TimezoneOverrideModal
-                                  userId={props.userId}
-                                  modalProps={modalProps} />,
-                          );
-                      }}
-                >
+                          openTimezoneOverwriteModal(props.userId);
+                      }}>
                     {shortTimeFormatted}
                 </span>
             </>}
@@ -118,7 +113,7 @@ interface TimezoneOverrideModalProps {
     modalProps: ModalProps,
 }
 
-export function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
+function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
     const [availableTimezones, setAvailableTimezones] = useState<SelectOption[]>();
     const [timezone, setTimezone] = useState<string | "NONE" | undefined>();
 
@@ -212,3 +207,11 @@ export function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
         </ModalFooter>
     </ModalRoot>;
 }
+
+export function openTimezoneOverwriteModal(userId: string) {
+    openModal(modalProps => <>
+        <ErrorBoundary>
+            <TimezoneOverrideModal userId={userId} modalProps={modalProps} />
+        </ErrorBoundary>
+    </>);
+}