diff --git a/Signal/src/Loki/LokiP2PServer.swift b/Signal/src/Loki/LokiP2PServer.swift
index ebd2377ec..06b07fa05 100644
--- a/Signal/src/Loki/LokiP2PServer.swift
+++ b/Signal/src/Loki/LokiP2PServer.swift
@@ -62,7 +62,7 @@ final class LokiP2PServer : NSObject {
         })
         
         // Handle our specific storage path
-        webServer.addHandler(forMethod: "POST", path: "/v1/storage_rpc", request: GCDWebServerDataRequest.self, processBlock: { request in
+        webServer.addHandler(forMethod: "POST", path: "/storage_rpc/v1", request: GCDWebServerDataRequest.self, processBlock: { request in
             // Make sure we were sent a good request
             guard let dataRequest = request as? GCDWebServerDataRequest, let json = dataRequest.jsonObject else {
                 return GCDWebServerResponse(statusCode: StatusCode.badRequest)
diff --git a/SignalServiceKit/src/Loki/API/LokiAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI.swift
index 63437661d..ea32ba3a3 100644
--- a/SignalServiceKit/src/Loki/API/LokiAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiAPI.swift
@@ -39,7 +39,7 @@ public final class LokiAPI : NSObject {
     // MARK: Internal API
     internal static func invoke(_ method: LokiAPITarget.Method, on target: LokiAPITarget, associatedWith hexEncodedPublicKey: String,
         parameters: [String:Any], headers: [String:String]? = nil, timeout: TimeInterval? = nil) -> RawResponsePromise {
-        let url = URL(string: "\(target.address):\(target.port)/\(version)/storage_rpc")!
+        let url = URL(string: "\(target.address):\(target.port)/storage_rpc/\(version)")!
         let request = TSRequest(url: url, method: "POST", parameters: [ "method" : method.rawValue, "params" : parameters ])
         if let headers = headers { request.allHTTPHeaderFields = headers }
         request.timeoutInterval = timeout ?? defaultTimeout