diff --git a/lib/main_app.dart b/lib/main_app.dart
index c8801fd3e..307828a81 100644
--- a/lib/main_app.dart
+++ b/lib/main_app.dart
@@ -151,7 +151,13 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
         return;
       }
 
-      store.dispatch(RefreshData());
+      final millisecondsSinceLastUpdate =
+          DateTime.now().millisecondsSinceEpoch -
+              state.userCompanyState.lastUpdated;
+
+      if (millisecondsSinceLastUpdate > kMillisecondsToTimerRefreshData) {
+        store.dispatch(RefreshData());
+      }
     });
   }
 
diff --git a/lib/ui/app/web_session_timeout.dart b/lib/ui/app/web_session_timeout.dart
index 588b1171b..954d50ebc 100644
--- a/lib/ui/app/web_session_timeout.dart
+++ b/lib/ui/app/web_session_timeout.dart
@@ -37,7 +37,7 @@ class _WebSessionTimeoutState extends State<WebSessionTimeout> {
         final state = store.state;
         final sessionTimeout = state.company.sessionTimeout;
 
-        if (sessionTimeout == 0 || isDesktop(context)) {
+        if (sessionTimeout == 0) {
           return;
         }