diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
index a109dcdee2..d87b0925ef 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
@@ -134,7 +134,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         var aspectRatio: CGFloat?
         let width = imageInfo.width.map(CGFloat.init)
         let height = imageInfo.height.map(CGFloat.init)
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
         
@@ -488,7 +488,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         let height = messageContent.info?.height.map(CGFloat.init)
         
         var aspectRatio: CGFloat?
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
         
@@ -508,7 +508,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         let height = messageContent.info?.height.map(CGFloat.init)
         
         var aspectRatio: CGFloat?
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
         
diff --git a/changelog.d/pr-2437.bugfix b/changelog.d/pr-2437.bugfix
new file mode 100644
index 0000000000..f9c59983e4
--- /dev/null
+++ b/changelog.d/pr-2437.bugfix
@@ -0,0 +1 @@
+Prevent crashes when computing aspect ratios on zero media width or height
\ No newline at end of file