diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 45fc94ffa..de9565091 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -42,7 +42,6 @@ static const CLLocationCoordinate2D WorldTourDestinations[] = {
             @"MBXUserTrackingMode": @(MGLUserTrackingModeNone),
             @"MBXShowsUserLocation": @NO,
             @"MBXDebug": @NO,
-            @"MGLTelemetryTestServerURL": @"https://cloudfront-staging.tilestream.net",
         }];
     }
 }
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index 7e6add662..f4acc0118 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/platform/ios/src/MGLMapboxEvents.m
@@ -140,6 +140,9 @@ const NSTimeInterval MGLFlushInterval = 180;
              @"MGLMapboxAccountType": accountTypeNumber ?: @0,
              @"MGLMapboxMetricsEnabled": @YES,
              @"MGLMapboxMetricsDebugLoggingEnabled": @NO,
+#if TARGET_OS_SIMULATOR
+             @"MGLTelemetryTestServerURL": @"https://cloudfront-staging.tilestream.net",
+#endif
          }];
     }
 }
@@ -360,7 +363,7 @@ const NSTimeInterval MGLFlushInterval = 180;
         [self pushTurnstileEvent];
     }
     
-    if ([self isPaused]) {
+    if (self.paused) {
         return;
     }
     
@@ -450,7 +453,7 @@ const NSTimeInterval MGLFlushInterval = 180;
 // Called implicitly from public use of +flush.
 //
 - (void)postEvents:(NS_ARRAY_OF(MGLMapboxEventAttributes *) *)events {
-    if ([self isPaused]) {
+    if (self.paused) {
         return;
     }