diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
index b1d0e4aefe9c62b687e330a9631812aa0b43b60d..dc4b572c577fef5e557d4171f8cbd1da90c28634 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -178,12 +178,22 @@
                             isTracked = false;
                         }
                         
+                        NSString* device = @"";
+                        if (@available(iOS 11.0, *)) {
+                            device = [[sample sourceRevision] productType];
+                        } else {
+                            device = [[sample device] name];
+                            if (!device) {
+                                device = @"iPhone";
+                            }
+                        }
+                        
                         NSDictionary *elem = @{
                                                valueType : @(value),
                                                @"tracked" : @(isTracked),
                                                @"sourceName" : [[[sample sourceRevision] source] name],
                                                @"sourceId" : [[[sample sourceRevision] source] bundleIdentifier],
-                                               @"device": [[sample sourceRevision] productType],
+                                               @"device": device,
                                                @"start" : startDateString,
                                                @"end" : endDateString
                                                };