diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_whlile_true_always_returned.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_whlile_true_always_returned.php.inc
new file mode 100644
index 00000000000..e61df85ca7d
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_do_whlile_true_always_returned.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipDoWhileTrueAlwaysReturned
+{
+    public function run()
+    {
+		do {
+            if (mt_rand() === 0) {
+                return 'yay';
+            }
+        } while (true);
+    }
+}
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_while_true_always_returned.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_while_true_always_returned.php.inc
new file mode 100644
index 00000000000..28fea3612d2
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_while_true_always_returned.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipWhileTrueAlwaysReturned
+{
+    public function run()
+    {
+		while (true) {
+            if (mt_rand() === 0) {
+                return 'yay';
+            }
+        }
+    }
+}
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
index fb0a0bcee17..80d53e3e379 100644
--- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
+++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -15,6 +15,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Case_;
+use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Continue_;
 use PhpParser\Node\Stmt\Do_;
@@ -28,8 +29,12 @@
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\Node\Stmt\TryCatch;
+use PhpParser\Node\Stmt\While_;
+use PhpParser\NodeTraverser;
 use PHPStan\Reflection\ClassReflection;
+use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 use Rector\PhpParser\Node\BetterNodeFinder;
+use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Reflection\ReflectionResolver;
 use Rector\TypeDeclaration\NodeAnalyzer\NeverFuncCallAnalyzer;
 
@@ -38,7 +43,9 @@
     public function __construct(
         private BetterNodeFinder $betterNodeFinder,
         private ReflectionResolver $reflectionResolver,
-        private NeverFuncCallAnalyzer $neverFuncCallAnalyzer
+        private NeverFuncCallAnalyzer $neverFuncCallAnalyzer,
+        private ValueResolver $valueResolver,
+        private SimpleCallableNodeTraverser $simpleCallableNodeTraverser
     ) {
     }
 
@@ -100,24 +107,51 @@ private function hasStmtsAlwaysReturnOrExit(array $stmts): bool
                 return true;
             }
 
-            if ($stmt instanceof Do_ && $this->isDoWithAlwaysReturnOrExit($stmt)) {
-                return true;
+            if (!$this->isDoOrWhileWithAlwaysReturnOrExit($stmt)) {
+                continue;
             }
+
+            return true;
         }
 
         return false;
     }
 
-    private function isDoWithAlwaysReturnOrExit(Do_ $do): bool
+    private function isFoundLoopControl(Do_|While_ $node): bool
+    {
+        $isFoundLoopControl = false;
+        $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
+            $node->stmts,
+            static function (Node $subNode) use (&$isFoundLoopControl) {
+                if ($subNode instanceof Class_ || $subNode instanceof Function_ || $subNode instanceof Closure) {
+                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                }
+
+                if ($subNode instanceof Break_ || $subNode instanceof Continue_ || $subNode instanceof Goto_) {
+                    $isFoundLoopControl = true;
+                    return NodeTraverser::STOP_TRAVERSAL;
+                }
+            }
+        );
+
+        return $isFoundLoopControl;
+    }
+
+    private function isDoOrWhileWithAlwaysReturnOrExit(Stmt $stmt): bool
     {
-        if (! $this->hasStmtsAlwaysReturnOrExit($do->stmts)) {
+        if (! $stmt instanceof Do_ && ! $stmt instanceof While_) {
             return false;
         }
 
-        return ! (bool) $this->betterNodeFinder->findFirst(
-            $do->stmts,
-            static fn (Node $node): bool => $node instanceof Break_ || $node instanceof Continue_ || $node instanceof Goto_
-        );
+        if ($this->valueResolver->isTrue($stmt->cond)) {
+            return ! $this->isFoundLoopControl($stmt);
+        }
+
+        if (! $this->hasStmtsAlwaysReturnOrExit($stmt->stmts)) {
+            return false;
+        }
+
+        return ! $this->isFoundLoopControl($stmt);;
     }
 
     private function isIfReturn(Stmt|Expr $stmt): bool