diff --git a/app/containers/markdown/Markdown.stories.tsx b/app/containers/markdown/Markdown.stories.tsx
index 16472f10e4..aed6c50346 100644
--- a/app/containers/markdown/Markdown.stories.tsx
+++ b/app/containers/markdown/Markdown.stories.tsx
@@ -159,12 +159,25 @@ export const Lists = () => (
 
 export const Timestamp = () => (
 	<View style={styles.container}>
-		<Markdown msg='t: <t:1735732800:t>' />
-		<Markdown msg='T: <t:1735732800:T>' />
-		<Markdown msg='d: <t:1735732800:d>' />
-		<Markdown msg='D: <t:1735732800:D>' />
-		<Markdown msg='f: <t:1735732800:f>' />
-		<Markdown msg='F: <t:1735732800:F>' />
-		<Markdown msg='R: <t:1735732800:R>' />
+		<Markdown msg='t (unix): <t:1735732800:t>' />
+		<Markdown msg='t (iso): <t:2026-01-23T12:16:24.314+00:00:t>' />
+
+		<Markdown msg='T (unix): <t:1735732800:T>' />
+		<Markdown msg='T (iso): <t:2026-01-23T12:16:24.314+00:00:T>' />
+
+		<Markdown msg='d (unix): <t:1735732800:d>' />
+		<Markdown msg='d (iso): <t:2026-01-23T12:16:24.314+00:00:d>' />
+
+		<Markdown msg='D (unix): <t:1735732800:D>' />
+		<Markdown msg='D (iso): <t:2026-01-23T12:16:24.314+00:00:D>' />
+
+		<Markdown msg='f (unix): <t:1735732800:f>' />
+		<Markdown msg='f (iso): <t:2026-01-23T12:16:24.314+00:00:f>' />
+
+		<Markdown msg='F (unix): <t:1735732800:F>' />
+		<Markdown msg='F (iso): <t:2026-01-23T12:16:24.314+00:00:F>' />
+
+		<Markdown msg='R (unix): <t:1735732800:R>' />
+		<Markdown msg='R (iso): <t:2026-01-23T12:16:24.314+00:00:R>' />
 	</View>
 );
diff --git a/app/containers/markdown/components/Timestamp.tsx b/app/containers/markdown/components/Timestamp.tsx
index da760661b3..981dc69cd5 100644
--- a/app/containers/markdown/components/Timestamp.tsx
+++ b/app/containers/markdown/components/Timestamp.tsx
@@ -14,7 +14,15 @@ interface ITimestampProps {
 const Timestamp = ({ value }: ITimestampProps): React.ReactElement => {
 	const { colors } = useTheme();
 
-	const timestampMs = React.useMemo(() => parseInt(value.timestamp, 10) * 1000, [value.timestamp]);
+	const timestampMs = React.useMemo(() => {
+		const isUnix = /^\d+$/.test(value.timestamp);
+
+		if (isUnix) {
+			return Number(value.timestamp) * 1000;
+		}
+
+		return dayjs(value.timestamp).valueOf();
+	}, [value.timestamp]);
 
 	const formatDate = React.useMemo(() => {
 		if (value.format === 't') {