diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
index dad6fabe3e..fe7cbaac77 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
@@ -51,6 +51,7 @@ open class Model(
      * specified, must also specify [_parentModel]
      */
     private val _parentProperty: String? = null,
+    private val initializationLock: Any = Any(),
 ) : IEventNotifier<IModelChangedHandler> {
     /**
      * A unique identifier for this model.
@@ -123,19 +124,25 @@ open class Model(
         id: String?,
         model: Model,
     ) {
-        data.clear()
+        val newData = Collections.synchronizedMap(mutableMapOf<String, Any?>())
+
         for (item in model.data) {
             if (item.value is Model) {
                 val childModel = item.value as Model
                 childModel._parentModel = this
-                data[item.key] = childModel
+                newData[item.key] = childModel
             } else {
-                data[item.key] = item.value
+                newData[item.key] = item.value
             }
         }
 
         if (id != null) {
-            data[::id.name] = id
+            newData[::id.name] = id
+        }
+
+        synchronized(initializationLock) {
+            data.clear()
+            data.putAll(newData)
         }
     }
 
@@ -429,19 +436,21 @@ open class Model(
         tag: String = ModelChangeTags.NORMAL,
         forceChange: Boolean = false,
     ) {
-        val oldValue = data[name]
+        synchronized(data) {
+            val oldValue = data[name]
 
-        if (oldValue == value && !forceChange) {
-            return
-        }
+            if (oldValue == value && !forceChange) {
+                return
+            }
 
-        if (value != null) {
-            data[name] = value
-        } else if (data.containsKey(name)) {
-            data.remove(name)
-        }
+            if (value != null) {
+                data[name] = value
+            } else if (data.containsKey(name)) {
+                data.remove(name)
+            }
 
-        notifyChanged(name, name, tag, oldValue, value)
+            notifyChanged(name, name, tag, oldValue, value)
+        }
     }
 
     /**
@@ -627,12 +636,14 @@ open class Model(
         name: String,
         create: (() -> Any?)? = null,
     ): Any? {
-        return if (data.containsKey(name) || create == null) {
-            data[name]
-        } else {
-            val defaultValue = create()
-            data[name] = defaultValue as Any?
-            defaultValue
+        synchronized(data) {
+            return if (data.containsKey(name) || create == null) {
+                data[name]
+            } else {
+                val defaultValue = create()
+                data[name] = defaultValue as Any?
+                defaultValue
+            }
         }
     }
 
@@ -660,29 +671,31 @@ open class Model(
      * @return The resulting [JSONObject].
      */
     fun toJSON(): JSONObject {
-        val jsonObject = JSONObject()
-        for (kvp in data) {
-            when (val value = kvp.value) {
-                is Model -> {
-                    jsonObject.put(kvp.key, value.toJSON())
-                }
-                is List<*> -> {
-                    val jsonArray = JSONArray()
-                    for (arrayItem in value) {
-                        if (arrayItem is Model) {
-                            jsonArray.put(arrayItem.toJSON())
-                        } else {
-                            jsonArray.put(arrayItem)
+        synchronized(initializationLock) {
+            val jsonObject = JSONObject()
+            for (kvp in data) {
+                when (val value = kvp.value) {
+                    is Model -> {
+                        jsonObject.put(kvp.key, value.toJSON())
+                    }
+                    is List<*> -> {
+                        val jsonArray = JSONArray()
+                        for (arrayItem in value) {
+                            if (arrayItem is Model) {
+                                jsonArray.put(arrayItem.toJSON())
+                            } else {
+                                jsonArray.put(arrayItem)
+                            }
                         }
+                        jsonObject.put(kvp.key, jsonArray)
+                    }
+                    else -> {
+                        jsonObject.put(kvp.key, value)
                     }
-                    jsonObject.put(kvp.key, jsonArray)
-                }
-                else -> {
-                    jsonObject.put(kvp.key, value)
                 }
             }
+            return jsonObject
         }
-        return jsonObject
     }
 
     override fun subscribe(handler: IModelChangedHandler) = changeNotifier.subscribe(handler)
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
index 314054fe18..e39679d1b0 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
@@ -45,7 +45,8 @@ abstract class ModelStore<TModel>(
             removeItem(oldModel, tag)
         }
 
-        addItem(model, tag)
+            addItem(model, tag)
+        }
     }
 
     override fun add(
@@ -58,7 +59,8 @@ abstract class ModelStore<TModel>(
             removeItem(oldModel, tag)
         }
 
-        addItem(model, tag, index)
+            addItem(model, tag, index)
+        }
     }
 
     override fun list(): Collection<TModel> {
@@ -92,8 +94,9 @@ abstract class ModelStore<TModel>(
     ) {
         clear(tag)
 
-        for (model in models) {
-            add(model, tag)
+            for (model in models) {
+                add(model, tag)
+            }
         }
     }
 
@@ -101,7 +104,7 @@ abstract class ModelStore<TModel>(
         val localList = models.toList()
         models.clear()
 
-        persist()
+            persist()
 
         for (item in localList) {
             // no longer listen for changes to this model
@@ -121,10 +124,10 @@ abstract class ModelStore<TModel>(
             models.add(model)
         }
 
-        // listen for changes to this model
-        model.subscribe(this)
+            // listen for changes to this model
+            model.subscribe(this)
 
-        persist()
+            persist()
 
         changeSubscription.fire { it.onModelAdded(model, tag) }
     }
@@ -135,10 +138,10 @@ abstract class ModelStore<TModel>(
     ) {
         models.remove(model)
 
-        // no longer listen for changes to this model
-        model.unsubscribe(this)
+            // no longer listen for changes to this model
+            model.unsubscribe(this)
 
-        persist()
+            persist()
 
         changeSubscription.fire { it.onModelRemoved(model, tag) }
     }
@@ -162,8 +165,6 @@ abstract class ModelStore<TModel>(
             for (model in models) {
                 jsonArray.put(model.toJSON())
             }
-
-            _prefs.saveString(PreferenceStores.ONESIGNAL, PreferenceOneSignalKeys.MODEL_STORE_PREFIX + name, jsonArray.toString())
         }
     }
 
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
index 86458fba58..0c6c3dd9da 100644
--- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
@@ -12,6 +12,8 @@ open class SingletonModelStore<TModel>(
     private val changeSubscription: EventProducer<ISingletonModelStoreChangeHandler<TModel>> = EventProducer()
     private val singletonId: String = "-singleton-"
 
+    private val replaceLock = Any()
+
     init {
         store.subscribe(this)
     }