diff --git a/android/src/main/java/com/formbricks/android/manager/UserManager.kt b/android/src/main/java/com/formbricks/android/manager/UserManager.kt
index dcde44e..ebd7d6a 100644
--- a/android/src/main/java/com/formbricks/android/manager/UserManager.kt
+++ b/android/src/main/java/com/formbricks/android/manager/UserManager.kt
@@ -48,7 +48,7 @@ object UserManager {
      * @param userId
      */
     fun set(userId: String) {
-        UpdateQueue.current.setUserId(userId)
+        UpdateQueue.setUserId(userId)
     }
 
     /**
@@ -58,7 +58,7 @@ object UserManager {
      * @param key
      */
     fun addAttribute(attribute: String, key: String) {
-        UpdateQueue.current.addAttribute(key, attribute)
+        UpdateQueue.addAttribute(key, attribute)
     }
 
     /**
@@ -67,7 +67,7 @@ object UserManager {
      * @param attributes
      */
     fun setAttributes(attributes: Map<String, String>) {
-        UpdateQueue.current.setAttributes(attributes)
+        UpdateQueue.setAttributes(attributes)
     }
 
     /**
@@ -76,7 +76,7 @@ object UserManager {
      * @param language
      */
     fun setLanguage(language: String) {
-        UpdateQueue.current.setLanguage(language)
+        UpdateQueue.setLanguage(language)
     }
 
     /**
@@ -143,7 +143,7 @@ object UserManager {
                     Formbricks.language = languageFromUserResponse
                 }
 
-                UpdateQueue.current.reset()
+                UpdateQueue.reset()
                 SurveyManager.filterSurveys()
                 startSyncTimer()
             } catch (e: Exception) {
@@ -183,7 +183,7 @@ object UserManager {
         backingLastDisplayedAt = null
         backingExpiresAt = null
         Formbricks.language = "default"
-        UpdateQueue.current.reset()
+        UpdateQueue.reset()
 
         if(isUserIdDefined) {
             Logger.d("User logged out successfully!")
diff --git a/android/src/main/java/com/formbricks/android/network/queue/UpdateQueue.kt b/android/src/main/java/com/formbricks/android/network/queue/UpdateQueue.kt
index bcd64b8..0e115cd 100644
--- a/android/src/main/java/com/formbricks/android/network/queue/UpdateQueue.kt
+++ b/android/src/main/java/com/formbricks/android/network/queue/UpdateQueue.kt
@@ -11,7 +11,8 @@ import kotlin.concurrent.timer
  * The given properties will be sent to the backend and updated in
  * the user object when the debounce interval is reached.
  */
-class UpdateQueue private constructor() {
+object UpdateQueue {
+    private const val DEBOUNCE_INTERVAL: Long = 500 // 500 ms
 
     private var userId: String? = null
     private var attributes: MutableMap<String, String>? = null
@@ -74,9 +75,4 @@ class UpdateQueue private constructor() {
         Logger.d("UpdateQueue - commit() called on UpdateQueue with $effectiveUserId and $attributes")
         UserManager.syncUser(effectiveUserId, attributes)
     }
-
-    companion object {
-        private const val DEBOUNCE_INTERVAL: Long = 500 // 500 ms
-        val current: UpdateQueue = UpdateQueue()
-    }
 }
\ No newline at end of file