diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClass.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClass.kt
index 48604ad495d..993fad7f194 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClass.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClass.kt
@@ -231,8 +231,8 @@ internal open class SymbolLightClass(
             val isLateInit = (propertySymbol as? KtKotlinPropertySymbol)?.isLateInit == true
             val isConst = (propertySymbol as? KtKotlinPropertySymbol)?.isConst == true
 
-            val forceStatic = classOrObjectSymbol.isObject
-            val takePropertyVisibility = !isCompanionObject && (isLateInit || isJvmField || isConst)
+            val forceStatic = classOrObjectSymbol.isObject || isCompanionObject
+            val takePropertyVisibility = isLateInit || isJvmField || isConst
 
             createField(
                 declaration = propertySymbol,
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.fir.java b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.fir.java
deleted file mode 100644
index cdddaa4f148..00000000000
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.fir.java
+++ /dev/null
@@ -1,18 +0,0 @@
-public abstract interface TraitClassObjectField /* TraitClassObjectField*/ {
-  @org.jetbrains.annotations.NotNull()
-  public static final TraitClassObjectField.Companion Companion;
-
-  @org.jetbrains.annotations.Nullable()
-  public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
-
-
-public static final class Companion /* TraitClassObjectField.Companion*/ {
-  @org.jetbrains.annotations.Nullable()
-  private final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
-
-  @org.jetbrains.annotations.Nullable()
-  private final java.lang.String y;
-
-  private  Companion();//  .ctor()
-
-}}