diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dart
index 017b9a454e..6c39eb0dec 100644
--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -122,7 +122,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     await _apiService.setAccessToken(accessToken);
 
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final customHeaders = Store.get(StoreKey.customHeaders);
+    final customHeaders = Store.tryGet(StoreKey.customHeaders);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
 
     // Get the deviceid from the store if it exists, otherwise generate a new one
diff --git a/mobile/lib/services/widget.service.dart b/mobile/lib/services/widget.service.dart
index 4ff18b56e6..23ec0aa770 100644
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -11,11 +11,14 @@ class WidgetService {
 
   const WidgetService(this._repository);
 
-  Future<void> writeCredentials(String serverURL, String sessionKey, String customHeaders) async {
+  Future<void> writeCredentials(String serverURL, String sessionKey, String? customHeaders) async {
     await _repository.setAppGroupId(appShareGroupId);
     await _repository.saveData(kWidgetServerEndpoint, serverURL);
     await _repository.saveData(kWidgetAuthToken, sessionKey);
-    await _repository.saveData(kWidgetCustomHeaders, customHeaders);
+
+    if (customHeaders != null && customHeaders.isNotEmpty) {
+      await _repository.saveData(kWidgetCustomHeaders, customHeaders);
+    }
 
     // wait 3 seconds to ensure the widget is updated, dont block
     Future.delayed(const Duration(seconds: 3), refreshWidgets);