diff --git a/lib/managers/mobile_app_integration_manager.class.dart b/lib/managers/mobile_app_integration_manager.class.dart
index 65f76c6..a1b0c0f 100644
--- a/lib/managers/mobile_app_integration_manager.class.dart
+++ b/lib/managers/mobile_app_integration_manager.class.dart
@@ -5,9 +5,9 @@ class MobileAppIntegrationManager {
   static final _appRegistrationData = {
     "device_name": "",
     "app_version": "$appVersion",
-    "manufacturer": DeviceInfoManager().manufacturer,
-    "model": DeviceInfoManager().model,
-    "os_version": DeviceInfoManager().osVersion,
+    "manufacturer": DeviceInfoManager().manufacturer ?? "unknown",
+    "model": DeviceInfoManager().model ?? "unknown",
+    "os_version": DeviceInfoManager().osVersion ?? "0",
     "app_data": {
       "push_token": "",
       "push_url": "https://us-central1-ha-client-c73c4.cloudfunctions.net/pushNotifyV3"