diff --git a/SignalServiceKit/src/Loki/API/FileServerAPI.swift b/SignalServiceKit/src/Loki/API/FileServerAPI.swift
index 3a0b4e0de..1472c916a 100644
--- a/SignalServiceKit/src/Loki/API/FileServerAPI.swift
+++ b/SignalServiceKit/src/Loki/API/FileServerAPI.swift
@@ -11,6 +11,13 @@ public final class FileServerAPI : DotNetAPI {
     @objc public static let server = "https://file.getsession.org"
     
     internal static var useOnionRequests = true
+    
+    private static let fileServerPublicKey: String = {
+        let base64EncodedPublicKey = "BWJQnVm97sQE3Q1InB4Vuo+U/T1hmwHBv0ipkiv8tzEc"
+        let publicKeyWithPrefix = Data(base64Encoded: base64EncodedPublicKey)!
+        let hexEncodedPublicKeyWithPrefix = publicKeyWithPrefix.toHexString()
+        return hexEncodedPublicKeyWithPrefix.removing05PrefixIfNeeded()
+    }()
 
     // MARK: Storage
     override internal class var authTokenCollection: String { return "LokiStorageAuthTokenCollection" }
diff --git a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift
index ca4470aeb..2423e7830 100644
--- a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift	
+++ b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift	
@@ -44,15 +44,6 @@ public enum OnionRequestAPI {
 
     // MARK: Onion Building Result
     private typealias OnionBuildingResult = (guardSnode: Snode, finalEncryptionResult: EncryptionResult, targetSnodeSymmetricKey: Data)
-    
-    // MARK: File Server
-    private static let fileServerPublicKey: Data = {
-        let base64EncodedPublicKey = "BWJQnVm97sQE3Q1InB4Vuo+U/T1hmwHBv0ipkiv8tzEc"
-        let publicKeyWithPrefix = Data(base64Encoded: base64EncodedPublicKey)!
-        let hexEncodedPublicKeyWithPrefix = publicKeyWithPrefix.toHexString()
-        let hexEncodedPublicKey = hexEncodedPublicKeyWithPrefix.removing05PrefixIfNeeded()
-        return Data(hex: hexEncodedPublicKey)
-    }()
 
     // MARK: Private API
     /// Tests the given snode. The returned promise errors out if the snode is faulty; the promise is fulfilled otherwise.