diff --git a/app/components/ChatMenu/ChatWindow/EditorModal.tsx b/app/components/ChatMenu/ChatWindow/EditorModal.tsx
index 4ae8d13..bc077a9 100644
--- a/app/components/ChatMenu/ChatWindow/EditorModal.tsx
+++ b/app/components/ChatMenu/ChatWindow/EditorModal.tsx
@@ -94,7 +94,7 @@ const EditorModal: React.FC<EditorProps> = ({ id, isLastMessage, setEditMode, ed
                 <Animated.View exiting={SlideOutDown.duration(100)} style={styles.editorContainer}>
                     <View style={styles.topText}>
                         <Text style={styles.nameText}>{entry?.name}</Text>
-                        <Text style={styles.timeText}>{swipe.send_date.toLocaleTimeString()}</Text>
+                        <Text style={styles.timeText}>{swipe?.send_date.toLocaleTimeString()}</Text>
                     </View>
 
                     <TextInput
diff --git a/constants/Chat.ts b/constants/Chat.ts
index 7ead7ce..edabf23 100644
--- a/constants/Chat.ts
+++ b/constants/Chat.ts
@@ -640,9 +640,13 @@ export namespace Chats {
     export const useSwipeData = (index: number) => {
         const message = useEntryData(index)
         const swipe_index = message.swipe_id
-        const swipe = message.swipes?.[swipe_index]
-        const swipeText = swipe?.swipe
-        const swipeId = swipe?.id
+        const { swipe, swipeText, swipeId } = useChatState(
+            useShallow((state) => ({
+                swipe: state?.data?.messages?.[index].swipes[swipe_index],
+                swipeText: state?.data?.messages?.[index].swipes[swipe_index].swipe ?? '',
+                swipeId: state?.data?.messages?.[index].swipes[swipe_index].id,
+            }))
+        )
         return { swipeId, swipe, swipeText }
     }