diff --git a/frontend/mining-app/lib/core/telemetry/telemetry_service.dart b/frontend/mining-app/lib/core/telemetry/telemetry_service.dart
index d9b924bf..96e739f3 100644
--- a/frontend/mining-app/lib/core/telemetry/telemetry_service.dart
+++ b/frontend/mining-app/lib/core/telemetry/telemetry_service.dart
@@ -179,12 +179,22 @@ class TelemetryService {
       }
     }
 
+    final deviceProps = _deviceContext != null
+        ? {
+            'device_brand': _deviceContext!.brand,
+            'device_model': _deviceContext!.model,
+            'device_os': _deviceContext!.osVersion,
+            'app_version': _deviceContext!.appVersion,
+            'locale': _deviceContext!.locale,
+          }
+        : <String, dynamic>{};
+
     final event = TelemetryEvent(
       eventId: const Uuid().v4(),
       type: type,
       level: level,
       name: eventName,
-      properties: properties,
+      properties: {...deviceProps, ...?properties},
       timestamp: DateTime.now(),
       userId: _userId,
       sessionId: _sessionManager.currentSessionId,
diff --git a/frontend/mobile-app/lib/core/telemetry/telemetry_service.dart b/frontend/mobile-app/lib/core/telemetry/telemetry_service.dart
index 4da6a272..194ea3e3 100644
--- a/frontend/mobile-app/lib/core/telemetry/telemetry_service.dart
+++ b/frontend/mobile-app/lib/core/telemetry/telemetry_service.dart
@@ -183,17 +183,27 @@ class TelemetryService {
       }
     }
 
+    final deviceProps = _deviceContext != null
+        ? {
+            'device_brand': _deviceContext!.brand,
+            'device_model': _deviceContext!.model,
+            'device_os': _deviceContext!.osVersion,
+            'app_version': _deviceContext!.appVersion,
+            'locale': _deviceContext!.locale,
+          }
+        : <String, dynamic>{};
+
     final event = TelemetryEvent(
       eventId: const Uuid().v4(),
       type: type,
       level: level,
       name: eventName,
-      properties: properties,
+      properties: {...deviceProps, ...?properties},
       timestamp: DateTime.now(),
       userId: _userId,
       sessionId: _sessionManager.currentSessionId,
       installId: _installId,
-      deviceContextId: _deviceContext!.androidId,
+      deviceContextId: _deviceContext?.androidId ?? '',
     );
 
     _storage.enqueueEvent(event);