diff --git a/Samples/ContextAPIMixpanel/android/gradle/wrapper/gradle-wrapper.properties b/Samples/ContextAPIMixpanel/android/gradle/wrapper/gradle-wrapper.properties
index 14e30f74..9ff935b3 100644
--- a/Samples/ContextAPIMixpanel/android/gradle/wrapper/gradle-wrapper.properties
+++ b/Samples/ContextAPIMixpanel/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Apr 11 14:26:54 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Samples/MixpanelDemo/android/gradle/wrapper/gradle-wrapper.properties b/Samples/MixpanelDemo/android/gradle/wrapper/gradle-wrapper.properties
index 84226702..ee921b34 100644
--- a/Samples/MixpanelDemo/android/gradle/wrapper/gradle-wrapper.properties
+++ b/Samples/MixpanelDemo/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Apr 11 14:27:25 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Samples/SimpleMixpanel/package.json b/Samples/SimpleMixpanel/package.json
index affc8414..fe616d60 100644
--- a/Samples/SimpleMixpanel/package.json
+++ b/Samples/SimpleMixpanel/package.json
@@ -38,4 +38,4 @@
     "node": ">=18"
   },
   "packageManager": "yarn@1.22.22"
-}
+}
\ No newline at end of file
diff --git a/__tests__/main.test.js b/__tests__/main.test.js
index 9ec8d811..d920cf83 100644
--- a/__tests__/main.test.js
+++ b/__tests__/main.test.js
@@ -185,7 +185,7 @@ describe("MixpanelMain", () => {
     const optOutTrackingDefault = false;
     const superProperties = {superProp1: "value1", superProp2: "value2"};
     const serverURL = "https://api.mixpanel.com";
-    console.info("here111");
+
     await mixpanelMain.initialize(
       token,
       trackAutomaticEvents,
diff --git a/javascript/mixpanel-queue.js b/javascript/mixpanel-queue.js
index 0f1f587b..a86e2adf 100644
--- a/javascript/mixpanel-queue.js
+++ b/javascript/mixpanel-queue.js
@@ -2,11 +2,18 @@ import {MixpanelPersistent} from "./mixpanel-persistent";
 
 export const MixpanelQueueManager = (() => {
   let _queues = {};
-  const mixpanelPersistent = MixpanelPersistent.getInstance();
+  let mixpanelPersistent;
+
+  const getPersistent = () => {
+    if (!mixpanelPersistent) {
+        mixpanelPersistent = MixpanelPersistent.getInstance();
+    }
+    return mixpanelPersistent;
+  };
 
   const initialize = async (token, type) => {
     if (!_queues[token] || !_queues[token][type]) {
-      const queue = await mixpanelPersistent.loadQueue(token, type);
+      const queue = await getPersistent().loadQueue(token, type);
       _queues[token] = {
         ..._queues[token],
         [type]: queue,
@@ -18,7 +25,7 @@ export const MixpanelQueueManager = (() => {
     if (!_queues[token] || !_queues[token][type]) {
       return;
     }
-    await mixpanelPersistent.saveQueue(token, type, _queues[token][type]);
+    await getPersistent().saveQueue(token, type, _queues[token][type]);
   };
 
   const enqueue = async (token, type, data) => {