diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index ced456aa455..99cec9d2276 100644
--- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -122,7 +122,7 @@ class RawFirBuilder(val session: FirSession) {
                 isGetter,
                 visibility,
                 if (isGetter) {
-                    returnTypeReference.toFirOrImplicitType()
+                    returnTypeReference?.convertSafe() ?: propertyType
                 } else {
                     returnTypeReference.toFirOrUnitType()
                 },
diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
index 1db40b1bc52..66d4591837b 100644
--- a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
+++ b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
@@ -16,7 +16,7 @@ FILE: simpleClass.kt
         }
 
         public? open? override property bar(var): Boolean
-            public? get(): <implicit> {
+            public? get(): Boolean {
                 STUB
             }
             public? set(value: Boolean): kotlin.Unit {
diff --git a/compiler/testData/fir/resolve/multifile/Annotations.txt b/compiler/testData/fir/resolve/multifile/Annotations.txt
index 8fc4746c341..8086ebb13ae 100644
--- a/compiler/testData/fir/resolve/multifile/Annotations.txt
+++ b/compiler/testData/fir/resolve/multifile/Annotations.txt
@@ -19,7 +19,7 @@ FILE: Annotations.kt
         }
 
         public? open? override property v(val): R|kotlin/String|
-            @R|annotations/Simple|() public? get(): R|error: Not supported: FirImplicitTypeImpl| {
+            @R|annotations/Simple|() public? get(): R|kotlin/String| {
                 STUB
             }
 
diff --git a/compiler/testData/fir/resolve/simpleClass.txt b/compiler/testData/fir/resolve/simpleClass.txt
index fa61dcd562b..7514951b06d 100644
--- a/compiler/testData/fir/resolve/simpleClass.txt
+++ b/compiler/testData/fir/resolve/simpleClass.txt
@@ -16,7 +16,7 @@ FILE: simpleClass.kt
         }
 
         public? open? override property bar(var): R|kotlin/Boolean|
-            public? get(): R|error: Not supported: FirImplicitTypeImpl| {
+            public? get(): R|kotlin/Boolean| {
                 STUB
             }
             public? set(value: R|kotlin/Boolean|): R|kotlin/Unit| {
diff --git a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt b/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt
index 8d2b7fac2e4..56cce3ef904 100644
--- a/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt
+++ b/compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt
@@ -1,5 +1,5 @@
 FILE: typeParameterInPropertyReceiver.kt
     <T : R|kotlin/Any|> public? final? property self R|T|.(val): R|T|
-        public? get(): R|error: Not supported: FirImplicitTypeImpl| {
+        public? get(): R|T| {
             STUB
         }