diff --git a/lib/services/app_database.dart b/lib/services/app_database.dart
index 2c17728..1751ec0 100644
--- a/lib/services/app_database.dart
+++ b/lib/services/app_database.dart
@@ -519,7 +519,7 @@ class AppDatabase {
     final map = _withSyncColumns(track.toMap());
     map['device_id'] ??= Get.isRegistered<DeviceIdentityService>() &&
             DeviceIdentityService.to.isReady
-        ? DeviceIdentityService.to.appInstanceId
+        ? DeviceIdentityService.to.deviceId
         : null;
     map['app_instance_id'] ??= DeviceIdentityService.to.appInstanceId;
     return db.insert('tracks', map);
@@ -906,7 +906,7 @@ class AppDatabase {
     final map = _withSyncColumns(point.toMap());
     map['device_id'] ??= Get.isRegistered<DeviceIdentityService>() &&
             DeviceIdentityService.to.isReady
-        ? DeviceIdentityService.to.appInstanceId
+        ? DeviceIdentityService.to.deviceId
         : null;
     map['app_instance_id'] ??= DeviceIdentityService.to.appInstanceId;
 
@@ -1003,7 +1003,7 @@ class AppDatabase {
     final map = p.toMap();
     map['device_id'] ??= Get.isRegistered<DeviceIdentityService>() &&
             DeviceIdentityService.to.isReady
-        ? DeviceIdentityService.to.appInstanceId
+        ? DeviceIdentityService.to.deviceId
         : null;
     map['app_instance_id'] ??= DeviceIdentityService.to.appInstanceId;
     return db.insert('stakeout_points', map);
@@ -1027,7 +1027,7 @@ class AppDatabase {
         final map = p.toMap();
         map['device_id'] ??= Get.isRegistered<DeviceIdentityService>() &&
                 DeviceIdentityService.to.isReady
-            ? DeviceIdentityService.to.appInstanceId
+            ? DeviceIdentityService.to.deviceId
             : null;
         map['app_instance_id'] ??= DeviceIdentityService.to.appInstanceId;