diff --git a/lib/data.dart b/lib/data.dart
index 54639c5..70df0b0 100644
--- a/lib/data.dart
+++ b/lib/data.dart
@@ -11,7 +11,8 @@ const legacyJarvisApiUrl = 'http://80.211.202.74';
 const appVersionLabel = 'v1.0.0+1';
 const googleCalendarServerClientId = String.fromEnvironment(
   'GOOGLE_SERVER_CLIENT_ID',
-  defaultValue: '',
+  defaultValue:
+      '878009721400-319kqgal05noce291ptcdqt47srancqf.apps.googleusercontent.com',
 );
 
 const avatarPresets = [
@@ -209,7 +210,9 @@ class AppSettings {
           ? JarvisSettings.fromJson(rawJarvisSettings)
           : JarvisSettings.defaults(),
       googleServerClientId:
-          json['googleServerClientId'] as String? ?? googleCalendarServerClientId,
+          (json['googleServerClientId'] as String?)?.trim().isNotEmpty == true
+          ? (json['googleServerClientId'] as String).trim()
+          : googleCalendarServerClientId,
     );
   }