diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
index 63804cdd16b4..a7657bc2d53f 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
@@ -296,7 +296,8 @@ class JarPackager private constructor(
     val packToDir = context.options.isUnpackedDist &&
                     !item.relativeOutputFile.contains('/') &&
                     (patchedContent.isEmpty() || (patchedContent.size == 1 && patchedContent.containsKey("META-INF/plugin.xml"))) &&
-                    extraExcludes.isEmpty()
+                    extraExcludes.isEmpty() &&
+                    !moduleOutDir.toString().endsWith(".jar")
 
     val outFile = outDir.resolve(item.relativeOutputFile)
     val asset = if (packToDir) {
@@ -934,6 +935,9 @@ private suspend fun buildAsset(
             SizeAndHash(size = 0, hash = computeHashForModuleOutput(it as DirSource))
           }
         }
+        else {
+          error("Unexpected source: $source")
+        }
       }
     }
     return BuildAssetResult(sourceToNativeFiles = emptyMap(), sourceToMetadata = sourceToMetadata)