diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/switch_maybe_return.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/switch_maybe_return.php.inc
new file mode 100644
index 00000000000..e3c4e0c410f
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/switch_maybe_return.php.inc
@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+class SwitchMaybeReturn
+{
+    public function run(int $number)
+    {
+        switch ($number) {
+            case 1:
+                return 1;
+            case 2:
+            default:
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+class SwitchMaybeReturn
+{
+    public function run(int $number)
+    {
+        switch ($number) {
+            case 1:
+                return 1;
+            case 2:
+            default:
+        }
+        return null;
+    }
+}
+
+?>
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
index 71adfdf21db..880170072fa 100644
--- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
+++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -156,7 +156,7 @@ private function isSwitchWithAlwaysReturnOrExit(Switch_ $switch): bool
 
         foreach ($switch->cases as $case) {
             if (! $case->cond instanceof Expr) {
-                $hasDefault = true;
+                $hasDefault = $case->stmts !== [];
                 break;
             }
         }