diff --git a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart
index 231c7bd4..fa474533 100644
--- a/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart
+++ b/modules/legacy/modules/settings/lib/src/features/timezone/presentation/timezone_screen.dart
@@ -23,6 +23,7 @@ class TimezoneScreen extends ConsumerWidget {
           !next.hasError) {
         ref.read(timezoneSelectionProvider.notifier).clear();
         await showSuccessDialog(context, I18n.deviceUpdatedSuccess);
+        if (context.mounted) Navigator.of(context).pop();
       }
     });