diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt
index 6011b52c41..d580a6376e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt
@@ -316,11 +316,13 @@ private fun BoxScope.CropEditorCanvas(
                     ) { change, dragAmount ->
                         val activeTarget = dragTarget ?: return@detectDragGestures
                         change.consume()
+                        val gestureAreaWidth = imageRect.width.takeIf { it > 0f } ?: size.width.toFloat()
+                        val gestureAreaHeight = imageRect.height.takeIf { it > 0f } ?: size.height.toFloat()
                         onCropRectChange(
                             latestCropRect.applyChange(
                                 dragTarget = activeTarget,
-                                deltaX = dragAmount.x / size.width.toFloat(),
-                                deltaY = dragAmount.y / size.height.toFloat(),
+                                deltaX = dragAmount.x / gestureAreaWidth,
+                                deltaY = dragAmount.y / gestureAreaHeight,
                             )
                         )
                     }