diff --git a/app/src/main/java/com/bitchat/android/ui/media/ImageMessageItem.kt b/app/src/main/java/com/bitchat/android/ui/media/ImageMessageItem.kt
index 54b0f558..80124896 100644
--- a/app/src/main/java/com/bitchat/android/ui/media/ImageMessageItem.kt
+++ b/app/src/main/java/com/bitchat/android/ui/media/ImageMessageItem.kt
@@ -110,7 +110,7 @@ fun ImageMessageItem(
                                 .widthIn(max = 300.dp)
                                 .aspectRatio(aspect)
                                 .clip(androidx.compose.foundation.shape.RoundedCornerShape(10.dp))
-                                .clickable {
+                                .clickable(enabled = !isSpoilerVisible) {
                                     val currentIndex = imagePaths.indexOf(path)
                                     onImageClick?.invoke(path, imagePaths, currentIndex)
                                 }