diff --git a/src/Time/AmPmSwitcher.tsx b/src/Time/AmPmSwitcher.tsx
index ac133ef6..dcd4a8f8 100644
--- a/src/Time/AmPmSwitcher.tsx
+++ b/src/Time/AmPmSwitcher.tsx
@@ -4,7 +4,7 @@ import { MD2Theme, Text, TouchableRipple, useTheme } from 'react-native-paper'
 import { useMemo } from 'react'
 import Color from 'color'
 import { inputTypes, PossibleInputTypes, useSwitchColors } from './timeUtils'
-import { DisplayModeContext } from './TimePicker'
+import { DisplayModeContext } from '../contexts/DisplayModeContext'
 
 export default function AmPmSwitcher({
   onChange,
diff --git a/src/Time/AnalogClock.tsx b/src/Time/AnalogClock.tsx
index 7745c8fb..2dbaf736 100644
--- a/src/Time/AnalogClock.tsx
+++ b/src/Time/AnalogClock.tsx
@@ -22,7 +22,7 @@ import { useLatest } from '../utils'
 import AnalogClockHours from './AnalogClockHours'
 import AnimatedClockSwitcher from './AnimatedClockSwitcher'
 import AnalogClockMinutes from './AnalogClockMinutes'
-import { DisplayModeContext } from './TimePicker'
+import { DisplayModeContext } from '../contexts/DisplayModeContext'
 function AnalogClock({
   hours,
   minutes,
diff --git a/src/Time/TimePicker.tsx b/src/Time/TimePicker.tsx
index c704a72f..021dad06 100644
--- a/src/Time/TimePicker.tsx
+++ b/src/Time/TimePicker.tsx
@@ -12,11 +12,7 @@ import {
 import AnalogClock from './AnalogClock'
 import { circleSize } from './timeUtils'
 import TimeInputs from './TimeInputs'
-
-export const DisplayModeContext = React.createContext<{
-  mode: 'AM' | 'PM' | undefined
-  setMode: React.Dispatch<React.SetStateAction<'AM' | 'PM' | undefined>>
-}>({ mode: 'AM', setMode: () => {} })
+import { DisplayModeContext } from '../contexts/DisplayModeContext'
 
 type onChangeFunc = ({
   hours,
diff --git a/src/contexts/DisplayModeContext.tsx b/src/contexts/DisplayModeContext.tsx
new file mode 100644
index 00000000..055bc8af
--- /dev/null
+++ b/src/contexts/DisplayModeContext.tsx
@@ -0,0 +1,6 @@
+import * as React from 'react'
+
+export const DisplayModeContext = React.createContext<{
+  mode: 'AM' | 'PM' | undefined
+  setMode: React.Dispatch<React.SetStateAction<'AM' | 'PM' | undefined>>
+}>({ mode: 'AM', setMode: () => {} })