diff --git a/lib/src/aggregate_sample.dart b/lib/src/aggregate_sample.dart
index 0d53d8a..b104030 100644
--- a/lib/src/aggregate_sample.dart
+++ b/lib/src/aggregate_sample.dart
@@ -135,8 +135,6 @@ extension AggregateSample<T> on Stream<T> {
         } else {
           triggerSub!.pause();
         }
-        // Handle opt-out nulls
-        cancels.removeWhere((Object? f) => f == null);
         if (cancels.isEmpty) return null;
         return cancels.wait.then((_) => null);
       };
diff --git a/lib/src/async_expand.dart b/lib/src/async_expand.dart
index e9de12e..e0c7672 100644
--- a/lib/src/async_expand.dart
+++ b/lib/src/async_expand.dart
@@ -78,10 +78,7 @@ extension AsyncExpand<T> on Stream<T> {
       }
       controller.onCancel = () {
         if (subscriptions.isEmpty) return null;
-        var cancels = [for (var s in subscriptions) s.cancel()]
-          // Handle opt-out nulls
-          ..removeWhere((Object? f) => f == null);
-        return cancels.wait.then((_) => null);
+        return [for (var s in subscriptions) s.cancel()].wait.then((_) => null);
       };
     };
     return controller.stream;
diff --git a/lib/src/combine_latest.dart b/lib/src/combine_latest.dart
index fe9e249..24eca4a 100644
--- a/lib/src/combine_latest.dart
+++ b/lib/src/combine_latest.dart
@@ -128,9 +128,7 @@ extension CombineLatest<T> on Stream<T> {
         var cancels = [
           sourceSubscription!.cancel(),
           otherSubscription!.cancel()
-        ]
-          // Handle opt-out nulls
-          ..removeWhere((Object? f) => f == null);
+        ];
         sourceSubscription = null;
         otherSubscription = null;
         return cancels.wait.then((_) => null);
@@ -230,11 +228,7 @@ extension CombineLatest<T> on Stream<T> {
       }
       controller.onCancel = () {
         if (subscriptions.isEmpty) return null;
-        var cancels = [for (var s in subscriptions) s.cancel()]
-          // Handle opt-out nulls
-          ..removeWhere((Object? f) => f == null);
-        if (cancels.isEmpty) return null;
-        return cancels.wait.then((_) => null);
+        return [for (var s in subscriptions) s.cancel()].wait.then((_) => null);
       };
     };
     return controller.stream;
diff --git a/lib/src/merge.dart b/lib/src/merge.dart
index 3180c02..9ffeb0a 100644
--- a/lib/src/merge.dart
+++ b/lib/src/merge.dart
@@ -90,11 +90,7 @@ extension Merge<T> on Stream<T> {
       }
       controller.onCancel = () {
         if (subscriptions.isEmpty) return null;
-        var cancels = [for (var s in subscriptions) s.cancel()]
-          // Handle opt-out nulls
-          ..removeWhere((Object? f) => f == null);
-        if (cancels.isEmpty) return null;
-        return cancels.wait.then((_) => null);
+        return [for (var s in subscriptions) s.cancel()].wait.then((_) => null);
       };
     };
     return controller.stream;
diff --git a/lib/src/switch.dart b/lib/src/switch.dart
index 95abd26..2ec3a54 100644
--- a/lib/src/switch.dart
+++ b/lib/src/switch.dart
@@ -124,9 +124,7 @@ extension SwitchLatest<T> on Stream<Stream<T>> {
         var cancels = [
           if (!outerStreamDone) outerSubscription.cancel(),
           if (sub != null) sub.cancel(),
-        ]
-          // Handle opt-out nulls
-          ..removeWhere((Object? f) => f == null);
+        ];
         if (cancels.isEmpty) return null;
         return cancels.wait.then(_ignore);
       };