diff --git a/packages/DeadCode/src/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector.php b/packages/DeadCode/src/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector.php
index 5be7dff3c562..f8ee20b4ade8 100644
--- a/packages/DeadCode/src/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector.php
+++ b/packages/DeadCode/src/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DeadCode\Rector\Class_;
 
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\MethodCall;
@@ -162,6 +163,9 @@ private function processClassStmts(Node $node, array $setterOnlyPropertiesAndMet
         if ($this->assignManipulator->isLocalPropertyAssign($node)) {
             /** @var Assign $node */
             $propertyFetch = $node->var;
+            if ($propertyFetch instanceof ArrayDimFetch) {
+                $propertyFetch = $propertyFetch->var;
+            }
             /** @var PropertyFetch $propertyFetch */
             if ($this->isNames($propertyFetch->name, $propertyNames)) {
                 $this->removeNode($node);
diff --git a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/deal_with_property_fetches.php.inc b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/deal_with_property_fetches.php.inc
new file mode 100644
index 000000000000..08d91e5c2cdb
--- /dev/null
+++ b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/deal_with_property_fetches.php.inc
@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodCallRector\deal_with_property_of_methodcall;
+
+class MyClass
+{
+    private $unused;
+    private $prop;
+
+    public function __construct($unused)
+    {
+        $this->unused = $unused;
+    }
+
+    public function foo()
+    {
+        $this->prop[] = 'foo';
+
+    }
+}
+?>
+-----
+<?php
+
+namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodCallRector\deal_with_property_of_methodcall;
+
+class MyClass
+{
+    private $prop;
+    public function __construct($unused)
+    {
+    }
+    public function foo()
+    {
+        $this->prop[] = 'foo';
+
+    }
+}
+?>
diff --git a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/node_removal_on_non_expression.php.inc b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/node_removal_on_non_expression.php.inc
new file mode 100644
index 000000000000..88c430ad7146
--- /dev/null
+++ b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/Fixture/node_removal_on_non_expression.php.inc
@@ -0,0 +1,26 @@
+<?php
+namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodCallRector\node_removal_on_non_expression;
+
+class SomeClass
+{
+    /** @var */
+    private $foo;
+
+    public function setFoo($foo)
+    {
+        return $this->foo = $foo;
+    }
+
+}
+?>
+-----
+<?php
+namespace Rector\DeadCode\Tests\Rector\Class_\RemoveSetterOnlyPropertyAndMethodCallRector\node_removal_on_non_expression;
+
+class SomeClass
+{
+    public function setFoo($foo)
+    {
+    }
+}
+?>
diff --git a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php
index 7101fb874da3..0c31dc7f8f5c 100644
--- a/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php
+++ b/packages/DeadCode/tests/Rector/Class_/RemoveSetterOnlyPropertyAndMethodCallRector/RemoveSetterOnlyPropertyAndMethodCallRectorTest.php
@@ -26,6 +26,8 @@ public function provideDataForTest(): Iterator
         yield [__DIR__ . '/Fixture/keep_static_property.php.inc'];
         yield [__DIR__ . '/Fixture/keep_public_property.php.inc'];
         yield [__DIR__ . '/Fixture/keep_serializable_object.php.inc'];
+        yield [__DIR__ . '/Fixture/deal_with_property_fetches.php.inc'];
+        yield [__DIR__ . '/Fixture/node_removal_on_non_expression.php.inc'];
     }
 
     protected function getRectorClass(): string
diff --git a/src/PhpParser/Node/Commander/NodeRemovingCommander.php b/src/PhpParser/Node/Commander/NodeRemovingCommander.php
index c77fff19207e..21ea5ee82036 100644
--- a/src/PhpParser/Node/Commander/NodeRemovingCommander.php
+++ b/src/PhpParser/Node/Commander/NodeRemovingCommander.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Expression;
+use PhpParser\NodeDumper;
 use PhpParser\NodeTraverser;
 use Rector\Contract\PhpParser\Node\CommanderInterface;
 use Rector\Exception\ShouldNotHappenException;
@@ -37,8 +38,8 @@ public function addNode(Node $node): void
         $this->ensureIsNotPartOfChainMethodCall($node);
 
         $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
-        if (! $node instanceof Expression && $parentNode instanceof Expression) {
-            // only expressions can be removed
+        if (! $node instanceof Stmt && $parentNode instanceof Expression) {
+            // only stmts can be removed
             $node = $parentNode;
         }