diff --git a/Podfile b/Podfile
index d3d2d1b36..bb59575b1 100644
--- a/Podfile
+++ b/Podfile
@@ -15,7 +15,7 @@ target 'Session' do
   pod 'Sodium', :inhibit_warnings => true
   pod 'SSZipArchive', :inhibit_warnings => true
   pod 'Starscream', git: 'https://github.com/signalapp/Starscream.git', branch: 'signal-release', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
   pod 'YYImage', git: 'https://github.com/signalapp/YYImage', :inhibit_warnings => true
   pod 'ZXingObjC', :inhibit_warnings => true
 end
@@ -28,7 +28,7 @@ target 'SessionShareExtension' do
   pod 'PromiseKit', :inhibit_warnings => true
   pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
 
 target 'SessionPushNotificationExtension' do
@@ -39,7 +39,7 @@ target 'SessionPushNotificationExtension' do
   pod 'PromiseKit', :inhibit_warnings => true
   pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
 
 target 'SignalUtilitiesKit' do
@@ -57,7 +57,7 @@ target 'SignalUtilitiesKit' do
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
   pod 'Starscream', git: 'https://github.com/signalapp/Starscream.git', branch: 'signal-release', :inhibit_warnings => true
   pod 'SwiftProtobuf', '~> 1.5.0', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
   pod 'YYImage', git: 'https://github.com/signalapp/YYImage', :inhibit_warnings => true
 end
 
@@ -77,7 +77,7 @@ target 'SessionMessagingKit' do
   pod 'SAMKeychain', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
   pod 'SwiftProtobuf', '~> 1.5.0', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
 
 target 'SessionProtocolKit' do
@@ -96,7 +96,7 @@ target 'SessionSnodeKit' do
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit.git', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
 
 target 'SessionUtilitiesKit' do
@@ -108,7 +108,7 @@ target 'SessionUtilitiesKit' do
   pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
   pod 'SAMKeychain', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release', :inhibit_warnings => true
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
 
 post_install do |installer|
diff --git a/Podfile.lock b/Podfile.lock
index b348a5ae6..ffaae8fc0 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -144,7 +144,7 @@ DEPENDENCIES:
   - SSZipArchive
   - Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`)
   - SwiftProtobuf (~> 1.5.0)
-  - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
+  - YapDatabase/SQLCipher (from `https://github.com/loki-project/session-ios-yap-database.git`, branch `signal-release`)
   - YYImage (from `https://github.com/signalapp/YYImage`)
   - ZXingObjC
 
@@ -181,7 +181,7 @@ EXTERNAL SOURCES:
     :git: https://github.com/signalapp/Starscream.git
   YapDatabase:
     :branch: signal-release
-    :git: https://github.com/signalapp/YapDatabase.git
+    :git: https://github.com/loki-project/session-ios-yap-database.git
   YYImage:
     :git: https://github.com/signalapp/YYImage
 
@@ -200,7 +200,7 @@ CHECKOUT OPTIONS:
     :git: https://github.com/signalapp/Starscream.git
   YapDatabase:
     :commit: e43ab163b2dcb4c817339c819b07dac545f05fea
-    :git: https://github.com/signalapp/YapDatabase.git
+    :git: https://github.com/loki-project/session-ios-yap-database.git
   YYImage:
     :commit: d91910e6f313a255febbf69795198e74259bd51c
     :git: https://github.com/signalapp/YYImage
@@ -230,6 +230,6 @@ SPEC CHECKSUMS:
   YYImage: 6db68da66f20d9f169ceb94dfb9947c3867b9665
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: f65f7b4344906f219fb7e1e4ca93b4ed1ac3132a
+PODFILE CHECKSUM: 4ebb6a2d7cbbdd42f72f7e7669db8aff6e26cf7c
 
 COCOAPODS: 1.10.0.rc.1