diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
index 6a92a0be025295..7ff0c8207e1a68 100644
--- a/Python/optimizer_analysis.c
+++ b/Python/optimizer_analysis.c
@@ -296,7 +296,8 @@ remove_globals(_PyInterpreterFrame *frame, _PyUOpInstruction *buffer,
                 }
                 break;
             }
-            case _RETURN_VALUE:
+            case _RETURN_VALUE_FUNC:
+            case _RETURN_VALUE_GEN:
             {
                 builtins_watched >>= 1;
                 globals_watched >>= 1;