diff --git a/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart b/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
index d37ad507b7..7f09448352 100644
--- a/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
@@ -80,9 +80,7 @@ class _VideoStreamingSettingsPageState
                     icon: Icons.close_outlined,
                     iconButtonType: IconButtonType.secondary,
                     onTap: () {
-                      Navigator.pop(context);
-                      if (Navigator.canPop(context)) Navigator.pop(context);
-                      if (Navigator.canPop(context)) Navigator.pop(context);
+                      Navigator.popUntil(context, (route) => route.isFirst);
                     },
                   ),
                 ],