diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__basic.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__basic.php.inc
new file mode 100644
index 00000000000..fdbbcfe3b65
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__basic.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationBasic
+{
+    private SomeInterface $x;
+
+    public function __construct(
+        SomeInterfaceImplementation $x,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationBasic
+{
+    public function __construct(private SomeInterfaceImplementation $x)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__default_value_in_param.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__default_value_in_param.php.inc
new file mode 100644
index 00000000000..70b2aa11eb1
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__default_value_in_param.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationDefaultValueInParam
+{
+    private SomeInterface $x;
+
+    public function __construct(
+        SomeInterfaceImplementation $x = new SomeInterfaceImplementation(),
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationDefaultValueInParam
+{
+    public function __construct(private SomeInterfaceImplementation $x = new SomeInterfaceImplementation())
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default.php.inc
new file mode 100644
index 00000000000..ae084310e99
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNonNullableParamWithNullDefault
+{
+    private ?SomeInterface $x;
+
+    public function __construct(
+        SomeInterfaceImplementation $x = null,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNonNullableParamWithNullDefault
+{
+    public function __construct(private ?\Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation $x = null)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default_and_non_nullable_property.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default_and_non_nullable_property.php.inc
new file mode 100644
index 00000000000..a028195641d
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__non_nullable_param_with_null_default_and_non_nullable_property.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNonNullableParamWithNullDefaultAndNonNullableProperty
+{
+    private SomeInterface $x;
+
+    public function __construct(
+        SomeInterfaceImplementation $x = null,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNonNullableParamWithNullDefaultAndNonNullableProperty
+{
+    public function __construct(private ?\Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation $x = null)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param.php.inc
new file mode 100644
index 00000000000..29128df2c5c
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParam
+{
+    private ?SomeInterface $x;
+
+    public function __construct(
+        ?SomeInterfaceImplementation $x,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParam
+{
+    public function __construct(private ?SomeInterfaceImplementation $x)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_default_value.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_default_value.php.inc
new file mode 100644
index 00000000000..40f2f4c5fbc
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_default_value.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParamAndDefaultValue
+{
+    private ?SomeInterface $x;
+
+    public function __construct(
+        ?SomeInterfaceImplementation $x = null,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParamAndDefaultValue
+{
+    public function __construct(private ?SomeInterfaceImplementation $x = null)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_non_nullable_property.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_non_nullable_property.php.inc
new file mode 100644
index 00000000000..f42207f5e34
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__nullable_param_and_non_nullable_property.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParamAndNonNullableProperty
+{
+    private SomeInterface $x;
+
+    public function __construct(
+        ?SomeInterfaceImplementation $x,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationNullableParamAndNonNullableProperty
+{
+    public function __construct(private \Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation $x)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param.php.inc
new file mode 100644
index 00000000000..bdfa4a9cc2e
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParam
+{
+    private ?SomeInterface $x;
+
+    public function __construct(
+        null|SomeInterfaceImplementation $x,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParam
+{
+    public function __construct(private null|SomeInterfaceImplementation $x)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_default_value.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_default_value.php.inc
new file mode 100644
index 00000000000..66090020cb8
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_default_value.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParamAndDefaultValue
+{
+    private ?SomeInterface $x;
+
+    public function __construct(
+        null|SomeInterfaceImplementation $x = null,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParamAndDefaultValue
+{
+    public function __construct(private null|SomeInterfaceImplementation $x = null)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_non_nullable_property.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_non_nullable_property.php.inc
new file mode 100644
index 00000000000..49ee90ea0dc
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/with_interface_and_its_implementation__union_with_null_in_param_and_non_nullable_property.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParamAndNonNullableProperty
+{
+    private SomeInterface $x;
+
+    public function __construct(
+        null|SomeInterfaceImplementation $x,
+    ) {
+        $this->x = $x;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterface;
+use Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation;
+
+class WithInterfaceAndItsImplementationUnionWithNullInParamAndNonNullableProperty
+{
+    public function __construct(private \Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source\SomeInterfaceImplementation $x)
+    {
+    }
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterface.php b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterface.php
new file mode 100644
index 00000000000..036a459cfef
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterface.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source;
+
+interface SomeInterface {}
diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterfaceImplementation.php b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterfaceImplementation.php
new file mode 100644
index 00000000000..62d3a2d34c0
--- /dev/null
+++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Source/SomeInterfaceImplementation.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector\Source;
+
+class SomeInterfaceImplementation implements SomeInterface {}
diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
index 7d897abebc3..5d4190cb229 100644
--- a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
+++ b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
@@ -20,6 +21,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
@@ -30,6 +32,7 @@
 use Rector\Php80\DocBlock\PropertyPromotionDocBlockMerger;
 use Rector\Php80\Guard\MakePropertyPromotionGuard;
 use Rector\Php80\NodeAnalyzer\PromotedPropertyCandidateResolver;
+use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
@@ -90,7 +93,8 @@ public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
         private readonly PropertyPromotionRenamer $propertyPromotionRenamer,
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly StaticTypeMapper $staticTypeMapper
+        private readonly StaticTypeMapper $staticTypeMapper,
+        private readonly ValueResolver $valueResolver,
     ) {
     }
 
@@ -290,21 +294,27 @@ public function provideMinPhpVersion(): int
 
     private function processUnionType(Property $property, Param $param): void
     {
-        if ($property->type instanceof Node) {
+        if ($this->shouldUsePropertyTypeForPromotedParam($property, $param)) {
             $param->type = $property->type;
             return;
         }
 
-        if (! $param->default instanceof Expr) {
+        if (! $param->type instanceof Node) {
             return;
         }
 
-        if (! $param->type instanceof Node) {
+        $paramType = $this->getType($param->type);
+
+        if ($this->shouldRemoveNullFromForPromotedParamType($property, $param)) {
+            $paramType = TypeCombinator::removeNull($paramType);
+            $param->type = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($paramType, TypeKind::PARAM);
+        }
+
+        if (! $param->default instanceof Expr) {
             return;
         }
 
         $defaultType = $this->getType($param->default);
-        $paramType = $this->getType($param->type);
 
         if ($this->typeComparator->isSubtype($defaultType, $paramType)) {
             return;
@@ -376,4 +386,46 @@ private function shouldSkipPropertyOrParam(Property $property, Param $param): bo
             && $property->hooks !== []
             && ! $this->nodeComparator->areNodesEqual($property->type, $param->type);
     }
+
+    private function shouldRemoveNullFromForPromotedParamType(Property $property, Param $param): bool
+    {
+        if ($property->type === null || $param->type === null) {
+            return false;
+        }
+
+        if ($param->default !== null && $this->valueResolver->isNull($param->default)) {
+            return false;
+        }
+
+        $propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
+        $propertyTypeWithoutNull = TypeCombinator::removeNull($propertyType);
+
+        if (! $this->typeComparator->areTypesEqual($propertyTypeWithoutNull, $propertyType)) {
+            return false;
+        }
+
+        $paramType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
+        $paramTypeWithoutNull = TypeCombinator::removeNull($paramType);
+
+        return ! $this->typeComparator->areTypesEqual($paramTypeWithoutNull, $paramType);
+    }
+
+    private function shouldUsePropertyTypeForPromotedParam(Property $property, Param $param): bool
+    {
+        if ($property->type === null) {
+            return false;
+        }
+
+        if ($param->type === null) {
+            return true;
+        }
+
+        $propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
+        $propertyTypeWithoutNull = TypeCombinator::removeNull($propertyType);
+
+        $paramType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
+        $paramTypeWithoutNull = TypeCombinator::removeNull($paramType);
+
+        return $this->typeComparator->areTypesEqual($propertyTypeWithoutNull, $paramTypeWithoutNull);
+    }
 }