diff --git a/flutter/lib/pages/message_list/message_list.dart b/flutter/lib/pages/message_list/message_list.dart
index b9cc8b7..c0f49a0 100644
--- a/flutter/lib/pages/message_list/message_list.dart
+++ b/flutter/lib/pages/message_list/message_list.dart
@@ -113,8 +113,10 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
 
   @override
   void didPopNext() {
-    ApplicationLog.debug('[MessageList::RouteObserver] --> didPopNext (will background-refresh)');
-    _backgroundRefresh(false);
+    if (AppSettings().alwaysBackgroundRefreshMessageListOnPop) {
+      ApplicationLog.debug('[MessageList::RouteObserver] --> didPopNext (will background-refresh)');
+      _backgroundRefresh(false);
+    }
   }
 
   void _onLifecycleResume() {
diff --git a/flutter/lib/settings/app_settings.dart b/flutter/lib/settings/app_settings.dart
index a487fed..76df7ed 100644
--- a/flutter/lib/settings/app_settings.dart
+++ b/flutter/lib/settings/app_settings.dart
@@ -4,6 +4,7 @@ class AppSettings extends ChangeNotifier {
   bool groupNotifications = true;
   int messagePageSize = 128;
   bool showDebugButton = true;
+  bool alwaysBackgroundRefreshMessageListOnPop = false;
 
   static AppSettings? _singleton = AppSettings._internal();