diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift
index 007d319c6..271bbad1c 100644
--- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift
+++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift
@@ -29,13 +29,8 @@ public extension OWSPrimaryStorage {
     }
     
     public func getDeviceLinks(for masterHexEncodedPublicKey: String, in transaction: YapDatabaseReadTransaction) -> Set<DeviceLink> {
-        let collection = getDeviceLinkCollection(for: masterHexEncodedPublicKey)
-        var result: Set<DeviceLink> = []
-        transaction.enumerateRows(inCollection: collection) { _, object, _, _ in
-            guard let deviceLink = object as? DeviceLink else { return }
-            result.insert(deviceLink)
-        }
-        return result
+        let query = YapDatabaseQuery(string: "WHERE \(DeviceLinkIndex.masterHexEncodedPublicKey) = ?", parameters: [ masterHexEncodedPublicKey ])
+        return Set(DeviceLinkIndex.getDeviceLinks(for: query, in: transaction))
     }
     
     public func getDeviceLink(for slaveHexEncodedPublicKey: String, in transaction: YapDatabaseReadTransaction) -> DeviceLink? {