diff --git a/Sources/CloudSyncSession/CloudKitOperationHandler.swift b/Sources/CloudSyncSession/CloudKitOperationHandler.swift
index e70c4d2..2317788 100644
--- a/Sources/CloudSyncSession/CloudKitOperationHandler.swift
+++ b/Sources/CloudSyncSession/CloudKitOperationHandler.swift
@@ -433,10 +433,10 @@ private extension CloudKitOperationHandler {
     }
 
     func createSubscription(zoneID: CKRecordZone.ID, subscriptionID: String, completion: @escaping (Result<Bool, Error>) -> Void) {
-        let subscription = CKRecordZoneSubscription(
-            zoneID: zoneID,
-            subscriptionID: subscriptionID
-        )
+        
+        var subscription: CKSubscription = database.databaseScope == .shared ?
+            CKDatabaseSubscription(subscriptionID: subscriptionID) :
+            CKRecordZoneSubscription(zoneID: zoneID,subscriptionID: subscriptionID)
 
         let notificationInfo = CKSubscription.NotificationInfo()
         notificationInfo.shouldSendContentAvailable = true