diff --git a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt
index 7e454d7eb96..a13ded0cd4b 100644
--- a/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt
+++ b/libraries/kotlinx-metadata/klib/src/kotlinx/metadata/klib/impl/klibMetadataExtensions.kt
@@ -177,8 +177,12 @@ internal class KlibMetadataExtensions : MetadataExtensions {
                 val entryProto = ProtoBuf.EnumEntry.newBuilder()
                     .setName(c[entry.name])
                     .setExtension(KlibMetadataProtoBuf.enumEntryAnnotation, entryAnnotationsProto)
-                    .setExtension(KlibMetadataProtoBuf.enumEntryUniqId, entry.uniqId!!.writeUniqId().build())
-                    .setExtension(KlibMetadataProtoBuf.enumEntryOrdinal, entry.ordinal!!)
+                entry.uniqId?.let { uniqId ->
+                    entryProto.setExtension(KlibMetadataProtoBuf.enumEntryUniqId, uniqId.writeUniqId().build())
+                }
+                entry.ordinal?.let { ordinal ->
+                    entryProto.setExtension(KlibMetadataProtoBuf.enumEntryOrdinal, ordinal)
+                }
                 if (entryIndex == -1) {
                     proto.addEnumEntry(entryProto.build())
                 } else {