diff --git a/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/with_comment.php.inc b/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/with_comment.php.inc
new file mode 100644
index 00000000..82ddd76c
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/with_comment.php.inc
@@ -0,0 +1,51 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class WithComment extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+    public function test(string $filePath): void
+    {
+    }
+
+    /**
+     * some comment
+     */
+    public static function dataProvider()
+    {
+        return [
+            ['<?php implode(\'\', $foo, );', '<?php implode($foo, );'],
+            ['<?php implode(\'\', $foo, );', '<?php implode($foo, );']
+        ];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class WithComment extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+    public function test(string $filePath): void
+    {
+    }
+
+    /**
+     * some comment
+     */
+    public static function dataProvider(): \Iterator
+    {
+        yield ['<?php implode(\'\', $foo, );', '<?php implode($foo, );'];
+        yield ['<?php implode(\'\', $foo, );', '<?php implode($foo, );'];
+    }
+}
+
+?>
diff --git a/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php b/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php
index 51710228..b5fc84ef 100644
--- a/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php
+++ b/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php
@@ -173,6 +173,10 @@ private function removeReturnTag(ClassMethod $classMethod): void
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classMethod);
 
+        if (! $phpDocInfo->getReturnTagValue() instanceof ReturnTagValueNode) {
+            return;
+        }
+
         if ($phpDocInfo->getReturnType() instanceof ArrayType) {
             $keyType = $phpDocInfo->getReturnType()
                 ->getIterableKeyType();