diff --git a/Wikipedia/Code/APIURLComponentsBuilder.swift b/Wikipedia/Code/APIURLComponentsBuilder.swift
index d42b6667465..5883ab1f49b 100644
--- a/Wikipedia/Code/APIURLComponentsBuilder.swift
+++ b/Wikipedia/Code/APIURLComponentsBuilder.swift
@@ -25,6 +25,7 @@ public struct APIURLComponentsBuilder {
         let encodedPayloadJsonString = payloadString.wmf_UTF8StringWithPercentEscapes()
         
         var components = hostComponents
+        components.replacePercentEncodedPathWithPathComponents(basePathComponents)
         components.percentEncodedQuery = encodedPayloadJsonString
         return components
     }
diff --git a/Wikipedia/Code/RandomArticleFetcher.swift b/Wikipedia/Code/RandomArticleFetcher.swift
index 5d591bcc032..ebcc3af8b78 100644
--- a/Wikipedia/Code/RandomArticleFetcher.swift
+++ b/Wikipedia/Code/RandomArticleFetcher.swift
@@ -4,7 +4,7 @@ import Foundation
 public final class RandomArticleFetcher: Fetcher {
     @objc public func fetchRandomArticle(withSiteURL siteURL: URL, completion: @escaping (Error?, URL?, ArticleSummary?) -> Void) {
         let pathComponents = ["page", "random", "summary"]
-        guard let taskURL = configuration.pageContentServiceAPIURLForURL(siteURL, appending: pathComponents) else {
+        guard let taskURL = configuration.feedContentAPIURLForURL(siteURL, appending: pathComponents) else {
             completion(Fetcher.invalidParametersError, nil, nil)
             return
         }