diff --git a/lib/foundation/appdata.dart b/lib/foundation/appdata.dart
index 320dc10..54e9bb7 100644
--- a/lib/foundation/appdata.dart
+++ b/lib/foundation/appdata.dart
@@ -90,13 +90,15 @@ class _Appdata {
 
   /// Sync data from another device
   void syncData(Map<String, dynamic> data) {
-    for (var key in data.keys) {
-      if (_disableSync.contains(key)) {
-        continue;
+    if (data['settings'] is Map) {
+      var settings = data['settings'] as Map<String, dynamic>;
+      for (var key in settings.keys) {
+        if (!_disableSync.contains(key)) {
+          this.settings[key] = settings[key];
+        }
       }
-      settings[key] = data[key];
     }
-    searchHistory = List.from(data['searchHistory']);
+    searchHistory = List.from(data['searchHistory'] ?? []);
     saveData();
   }