diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt
index 1e1fc99b51c..e107e778148 100644
--- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt
+++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/metadata/MetadataProperty.kt
@@ -25,6 +25,11 @@ class MetadataProperty<in T : HasMetadata, R>(val default: R) {
     }
 
     operator fun setValue(thisRef: T, desc: KProperty<*>, value: R) {
-        thisRef.setData(desc.name, value)
+        if (value == default) {
+            thisRef.removeData(desc.name)
+        }
+        else {
+            thisRef.setData(desc.name, value)
+        }
     }
 }