diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
index 1d22a465a25..8f82dcc0413 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
@@ -174,12 +174,12 @@ internal class ModuleMetadataEmitter(
                         element.kind -> element
                         else -> element.copy(kind = bridgeSupportedKind)
                     }
-                    val kind = property.kind
                     val name = getPropertyNameInScope(property, data.container)
-                    KmProperty(property.flags, name, kind.getterFlags, kind.setterFlags).also { km ->
+                    KmProperty(property.flags, name, property.getterFlags, property.setterFlags).also { km ->
                         property.annotations.mapTo(km.annotations) { it.map() }
                         km.receiverParameterType = property.receiverType?.map()
                         km.returnType = property.type.map()
+                        val kind = property.kind
                         if (kind is PropertyStub.Kind.Var) {
                             kind.setter.annotations.mapTo(km.setterAnnotations) { it.map() }
                             // TODO: Maybe it's better to explicitly add setter parameter in stub.
@@ -286,11 +286,11 @@ private class MappingExtensions(
                 }
         ) or modality.flags
 
-    val PropertyStub.Kind.getterFlags: Flags
-        get() = when (this) {
-            is PropertyStub.Kind.Val -> getter.flags
-            is PropertyStub.Kind.Var -> getter.flags
-            is PropertyStub.Kind.Constant -> flags
+    val PropertyStub.getterFlags: Flags
+        get() = when (val kind = kind) {
+            is PropertyStub.Kind.Val -> kind.getter.flags(modality)
+            is PropertyStub.Kind.Var -> kind.getter.flags(modality)
+            is PropertyStub.Kind.Constant -> kind.flags
         }
 
     val PropertyStub.Kind.Constant.flags: Flags
@@ -299,27 +299,27 @@ private class MappingExtensions(
                 Flag.IS_FINAL
         )
 
-    private val PropertyAccessor.Getter.flags: Flags
-        get() = flagsOfNotNull(
+    private fun PropertyAccessor.Getter.flags(propertyModality: MemberStubModality): Flags =
+        flagsOfNotNull(
                 Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() },
                 Flag.IS_PUBLIC,
-                Flag.IS_FINAL,
                 Flag.PropertyAccessor.IS_NOT_DEFAULT,
                 Flag.PropertyAccessor.IS_EXTERNAL.takeIf { this is PropertyAccessor.Getter.ExternalGetter }
-        )
+        ) or propertyModality.flags
 
-    val PropertyStub.Kind.setterFlags: Flags
-        get() = if (this !is PropertyStub.Kind.Var) flagsOf()
-        else setter.flags
+    val PropertyStub.setterFlags: Flags
+        get() = when (val kind = kind) {
+            is PropertyStub.Kind.Var -> kind.setter.flags(modality)
+            else -> flagsOf()
+        }
 
-    val PropertyAccessor.Setter.flags: Flags
-        get() = flagsOfNotNull(
+    private fun PropertyAccessor.Setter.flags(propertyModality: MemberStubModality): Flags =
+        flagsOfNotNull(
                 Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() },
                 Flag.IS_PUBLIC,
-                Flag.IS_FINAL,
                 Flag.PropertyAccessor.IS_NOT_DEFAULT,
                 Flag.PropertyAccessor.IS_EXTERNAL.takeIf { this is PropertyAccessor.Setter.ExternalSetter }
-        )
+        ) or propertyModality.flags
 
     val StubType.flags: Flags
         get() = flagsOfNotNull(