diff --git a/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java b/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
index 5f5ac85f4..77c7ac46e 100644
--- a/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
+++ b/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
@@ -77,12 +77,13 @@ public void loadKitLibrary() {
                             .onKitsLoaded(() -> {
                                         mKitManager = kitManager;
                                         setKitsLoaded(true);
+                                        updateDataplan(mCoreCallbacks.getDataplanOptions());
                                     }
                             );
                 } else {
                     mKitManager = kitManager;
+                    updateDataplan(mCoreCallbacks.getDataplanOptions());
                 }
-                updateDataplan(mCoreCallbacks.getDataplanOptions());
             } catch (Exception e) {
                 Logger.debug("No Kit Framework detected.");
                 setKitsLoaded(true);
@@ -128,7 +129,7 @@ void setKitsLoaded(boolean kitsLoaded) {
             disableQueuing();
         }
         List<KitsLoadedListener> kitsLoadedListenersCopy = new ArrayList<>(kitsLoadedListeners);
-        for (KitsLoadedListener kitsLoadedListener: kitsLoadedListenersCopy) {
+        for (KitsLoadedListener kitsLoadedListener : kitsLoadedListenersCopy) {
             if (kitsLoadedListener != null) {
                 kitsLoadedListener.onKitsLoaded();
             }
@@ -198,7 +199,7 @@ void replayEvents() {
                         break;
                     case AttributeChange.INCREMENT_ATTRIBUTE:
                         if (attributeChange.value instanceof String) {
-                            mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String)attributeChange.value, attributeChange.mpid);
+                            mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String) attributeChange.value, attributeChange.mpid);
                         }
                         break;
                     case AttributeChange.TAG:
diff --git a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
index fa710cabe..b2a58337c 100644
--- a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
+++ b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
@@ -154,6 +154,7 @@ public KitsLoadedCallback updateKits(final JSONArray kitConfigs) {
         runOnKitThread(() -> {
                     kitConfigurations = parseKitConfigurations(kitConfigs);
                     runOnMainThread(() -> {
+                        updateDataplan(mCoreCallbacks.getDataplanOptions());
                         configureKits(kitConfigurations);
                         callback.setKitsLoaded();
                     });