diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m
index e93082b6599263185e3796284b1f41e16aef6279..132ff4a8f95997a3dddb6254c56d9dc0a72a2567 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m
@@ -151,15 +151,9 @@
                 
                 NSString *uuid = bloodPressureSystolicValue.UUID.UUIDString;
                 
-                NSError *error;
-                NSDictionary *metaDict;
-                if(bloodPressureSystolicValue.metadata == nil){
-                    metaDict = [[NSDictionary alloc] init];
-                }else{
-                    metaDict = bloodPressureSystolicValue.metadata;
-                }
-                NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                NSString *metadata = [bloodPressureSystolicValue.metadata == nil ? @"" : bloodPressureSystolicValue.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
 
                 NSDictionary *elem = @{
                                        @"bloodPressureSystolicValue" : @([bloodPressureSystolicValue.quantity doubleValueForUnit:unit]),
@@ -232,15 +226,9 @@
                                          
                                          NSString *uuid = bloodPressureValues.UUID.UUIDString;
                                          
-                                         NSError *error;
-                                         NSDictionary *metaDict;
-                                         if(bloodPressureSystolicValue.metadata == nil){
-                                             metaDict = [[NSDictionary alloc] init];
-                                         }else{
-                                             metaDict = bloodPressureSystolicValue.metadata;
-                                         }
-                                         NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                                         NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                                         NSString *metadata = [bloodPressureSystolicValue.metadata == nil ? @"" : bloodPressureSystolicValue.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                                         metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                                         metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
                                          
                                          NSDictionary *elem = @{
                                                                 @"bloodPressureSystolicValue" : @([bloodPressureSystolicValue.quantity doubleValueForUnit:unit]),
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
index 45749d73ea62e694c91d1429e08e4abf7ccb972e..ea4c6ed10df4af310c90ab2144757cc559b590c1 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -92,15 +92,9 @@
                     
                     NSString *uuid = sample.UUID.UUIDString;
                     
-                    NSError *error;
-                    NSDictionary *metaDict;
-                    if(sample.metadata == nil){
-                        metaDict = [[NSDictionary alloc] init];
-                    }else{
-                        metaDict = sample.metadata;
-                    }
-                    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                    NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                    NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
                     
                     NSDictionary *elem = @{
                             @"value" : @(value),
@@ -202,15 +196,9 @@
                     
                     NSString *uuid = sample.UUID.UUIDString;
                     
-                    NSError *error;
-                    NSDictionary *metaDict;
-                    if(sample.metadata == nil){
-                        metaDict = [[NSDictionary alloc] init];
-                    }else{
-                        metaDict = sample.metadata;
-                    }
-                    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                    NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                    NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
 
                     NSDictionary *elem = @{
                             @"value" : valueString,
@@ -540,15 +528,9 @@
                     
                     NSString *uuid = sample.UUID.UUIDString;
                     
-                    NSError *error;
-                    NSDictionary *metaDict;
-                    if(sample.metadata == nil){
-                        metaDict = [[NSDictionary alloc] init];
-                    }else{
-                        metaDict = sample.metadata;
-                    }
-                    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                    NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                    NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
                     
                     NSDictionary *elem = @{
                                            @"value" : @(value),
@@ -698,15 +680,9 @@
                     
                     NSString *uuid = sample.UUID.UUIDString;
                     
-                    NSError *error;
-                    NSDictionary *metaDict;
-                    if(sample.metadata == nil){
-                        metaDict = [[NSDictionary alloc] init];
-                    }else{
-                        metaDict = sample.metadata;
-                    }
-                    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error];
-                    NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+                    NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+                    metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""];
                     
                     NSDictionary *elem = @{
                                            @"value" : valueString,