3 files changed, 8 insertions, 3 deletions
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index 5cbb178c2c..bb16f77f98 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/platform/ios/src/MGLMapboxEvents.m
@@ -1,6 +1,7 @@
 #import "MGLMapboxEvents.h"
 #import "MBXSKUToken.h"
 #import "NSBundle+MGLAdditions.h"
+#import "MGLAccountManager_Private.h"
 
 static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios";
 static NSString * const MGLMapboxAccountType = @"MGLMapboxAccountType";
@@ -144,7 +145,9 @@ static NSString * const MGLVariableGeofence = @"VariableGeofence";
             [[MGLMapboxEvents sharedInstance] eventsManager].baseURL = [MGLMapboxEvents sharedInstance].baseURL;
         }
 
-        [[MGLMapboxEvents sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMaps;
+        if (MGLAccountManager.isAccountsSDKEnabled) {
+            [[self sharedInstance] eventsManager].skuId = MBXAccountsMapsSKUIDMaps;
+        }
         
         [self flush];
     });
diff --git a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
index 3a812c89ad..e83ffd2288 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
+++ b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
@@ -2,11 +2,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSString *const MBXAccountsSKUIDMaps;
+extern NSString *const MBXAccountsMapsSKUIDMaps;
+extern NSString *const MBXAccountsNavigationSKUIDMaps;
 
 @interface MBXSKUToken : NSObject
 
-+ (NSString *)skuToken;
+@property (class, nonatomic, readonly) NSString *mapsToken;
+@property (class, nonatomic, readonly) NSString *navigationToken;
 
 @end
 
diff --git a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
index e18e8ef4ef..678265bf35 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
+++ b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a