diff --git a/mobile-app/lib/features/main/screens/authentication_settings_screen.dart b/mobile-app/lib/features/main/screens/authentication_settings_screen.dart
index 87fc17ae..5ff36376 100644
--- a/mobile-app/lib/features/main/screens/authentication_settings_screen.dart
+++ b/mobile-app/lib/features/main/screens/authentication_settings_screen.dart
@@ -38,18 +38,19 @@ class _AuthenticationSettingsScreenState extends State<AuthenticationSettingsScr
   bool _isDeviceAuthEnabled = false;
   bool _isLoading = true;
   String _biometricDescription = 'Use Device Authentication';
-  int _authTimeout = 0;
+  late int _authTimeout;
 
   @override
   void initState() {
     super.initState();
+    _authTimeout = _localAuthService.getAuthTimeoutMinutes();
     _loadAuthenticationSettings();
   }
 
   Future<void> _loadAuthenticationSettings() async {
     try {
       final isEnabled = _localAuthService.isLocalAuthEnabled();
-      final authTimeout = _localAuthService.getAuthTimeout();
+      final authTimeout = _localAuthService.getAuthTimeoutMinutes();
       final isAvailable = await _localAuthService.isBiometricAvailable();
       final description = await _localAuthService.getBiometricDescription();
 
@@ -143,7 +144,7 @@ class _AuthenticationSettingsScreenState extends State<AuthenticationSettingsScr
   }
 
   void _setAuthTimeout(int timeoutDurationInMinutes) {
-    _localAuthService.setAuthTimeout(timeoutDurationInMinutes);
+    _localAuthService.setAuthTimeoutMinutes(timeoutDurationInMinutes);
     setState(() {
       _authTimeout = timeoutDurationInMinutes;
     });
diff --git a/mobile-app/lib/services/local_auth_service.dart b/mobile-app/lib/services/local_auth_service.dart
index d0a27e72..a00b081f 100644
--- a/mobile-app/lib/services/local_auth_service.dart
+++ b/mobile-app/lib/services/local_auth_service.dart
@@ -55,11 +55,11 @@ class LocalAuthService {
     _settingsService.setAuthEnabled(enabled);
   }
 
-  int getAuthTimeout() {
-    return _settingsService.getAuthTimeout() ?? 0;
+  int getAuthTimeoutMinutes() {
+    return _settingsService.getAuthTimeout() ?? 1;
   }
 
-  void setAuthTimeout(int timeoutDurationInMinutes) {
+  void setAuthTimeoutMinutes(int timeoutDurationInMinutes) {
     return _settingsService.setAuthTimeout(timeoutDurationInMinutes);
   }
 
@@ -175,9 +175,10 @@ class LocalAuthService {
       if (!isEnabled) return false;
 
       final DateTime? lastAuthTime = _settingsService.getLastSuccessfulAuthTime();
+
       if (lastAuthTime == null) return true;
 
-      final int timeoutDurationInMinutes = _settingsService.getAuthTimeout() ?? 5;
+      final int timeoutDurationInMinutes = getAuthTimeoutMinutes();
 
       final Duration authTimeout = Duration(minutes: timeoutDurationInMinutes);
 
@@ -186,7 +187,8 @@ class LocalAuthService {
         'auth time difference: ${DateTime.now().difference(lastAuthTime).inSeconds}',
       );
 
-      return DateTime.now().difference(lastAuthTime) > authTimeout;
+      final isTimeout = DateTime.now().difference(lastAuthTime) > authTimeout;
+      return isTimeout;
     } catch (e) {
       debugPrint('Error checking if authentication is required: $e');
       return true; // Err on the side of caution
diff --git a/quantus_sdk/lib/src/services/settings_service.dart b/quantus_sdk/lib/src/services/settings_service.dart
index c35685a4..98c5c1f4 100644
--- a/quantus_sdk/lib/src/services/settings_service.dart
+++ b/quantus_sdk/lib/src/services/settings_service.dart
@@ -225,6 +225,7 @@ class SettingsService {
     _prefs.setString(_lastSuccessfulAuthKey, time.toIso8601String());
   }
 
+  /// Do not call this directly - call local auth service getAuthTimeoutMinutes() instead.
   int? getAuthTimeout() {
     final int? authTimeout = _prefs.getInt(_authTimeoutKey);
     if (authTimeout == null) return null;
@@ -232,6 +233,7 @@ class SettingsService {
     return authTimeout;
   }
 
+  /// Do not call this directly - call local auth service setAuthTimeoutMinutes() instead.
   void setAuthTimeout(int timeoutDurationInMinutes) {
     _prefs.setInt(_authTimeoutKey, timeoutDurationInMinutes);
   }