diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt
index 72d2f502f..ad3ee8e36 100644
--- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt
@@ -178,6 +178,12 @@ class BookConverter(
     if (!mediaTypeToExtension.keys.contains(media.mediaType))
       throw MediaUnsupportedException("${media.mediaType} cannot be repaired. Must be one of ${mediaTypeToExtension.keys}")
 
+    if (book.path.extension.lowercase() == "epub" && media.mediaType == MediaType.ZIP.type) {
+      skippedRepairs += book.id
+      logger.info("EPUB file detected as zip should not be repaired, skipping: ${book.path}")
+      return
+    }
+
     val actualExtension = book.path.extension
     val correctExtension = mediaTypeToExtension[media.mediaType]