diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
index 2b4c7e6d8..44823ee69 100644
--- a/packages/pyright-internal/src/analyzer/typeEvaluator.ts
+++ b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -18679,8 +18679,14 @@ export function createTypeEvaluator(
                                             isClassInstance(iteratorTypeResult.type) &&
                                             ClassType.isBuiltIn(iteratorTypeResult.type, 'Coroutine')
                                         ) {
+                                            const yieldType =
+                                                iteratorTypeResult.type.typeArguments &&
+                                                iteratorTypeResult.type.typeArguments.length > 0
+                                                    ? iteratorTypeResult.type.typeArguments[0]
+                                                    : UnknownType.create();
+
                                             // Handle old-style (pre-await) Coroutines.
-                                            inferredYieldTypes.push();
+                                            inferredYieldTypes.push(yieldType);
                                             useAwaitableGenerator = true;
                                         } else {
                                             const yieldType = getTypeOfIterator(
@@ -18688,6 +18694,7 @@ export function createTypeEvaluator(
                                                 /* isAsync */ false,
                                                 yieldNode
                                             )?.type;
+
                                             inferredYieldTypes.push(yieldType ?? UnknownType.create());
                                         }
                                     } else {
@@ -18708,9 +18715,6 @@ export function createTypeEvaluator(
                             });
                         }
 
-                        if (inferredYieldTypes.length === 0) {
-                            inferredYieldTypes.push(getNoneType());
-                        }
                         const inferredYieldType = combineTypes(inferredYieldTypes);
 
                         // Inferred yield types need to be wrapped in a Generator or
diff --git a/packages/pyright-internal/src/tests/samples/coroutines3.py b/packages/pyright-internal/src/tests/samples/coroutines3.py
index 3cc709893..47b8d3892 100644
--- a/packages/pyright-internal/src/tests/samples/coroutines3.py
+++ b/packages/pyright-internal/src/tests/samples/coroutines3.py
@@ -17,7 +17,7 @@ async def func1() -> None:
 
 reveal_type(
     old_style_coroutine1,
-    expected_text="() -> AwaitableGenerator[None, Unknown, None, Any]",
+    expected_text="() -> AwaitableGenerator[Any, Unknown, None, Any]",
 )
 
 
diff --git a/packages/pyright-internal/src/tests/samples/generator3.py b/packages/pyright-internal/src/tests/samples/generator3.py
index f443d58c2..98ca70f81 100644
--- a/packages/pyright-internal/src/tests/samples/generator3.py
+++ b/packages/pyright-internal/src/tests/samples/generator3.py
@@ -54,3 +54,11 @@ def consumer3() -> ClassA | None:
         print(str)
     else:
         return value
+
+
+def generator4():
+    return
+    yield 1
+
+
+reveal_type(generator4(), expected_text="Generator[Never, Any, None]")