diff --git a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart
index 1e2ae26a..b86feacc 100644
--- a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart
+++ b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart
@@ -167,11 +167,6 @@ Stream<ContainerData?> selectedContainerData(Ref ref) {
 Future<int> selectedContainerTabCount(Ref ref) async {
   final selectedContainer = ref.watch(selectedContainerProvider);
 
-  if (selectedContainer == null) {
-    return 0;
-  }
-
-  // Use selectAsync to avoid UnmountedRefException when container changes
   return ref.watch(
     watchContainerTabIdsProvider(
       // ignore: provider_parameters
diff --git a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
index f3350b5c..9fea4f3b 100644
--- a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
+++ b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
@@ -134,4 +134,4 @@ final class SelectedContainerTabCountProvider
 }
 
 String _$selectedContainerTabCountHash() =>
-    r'36efadeaa356e34cfdb6c07dbba73eed6d2ad6ca';
+    r'b763f949210ac9106d4a9240c0e65bdfae2d18ec';