diff --git a/src/activities/browser/OpdsBookBrowserActivity.cpp b/src/activities/browser/OpdsBookBrowserActivity.cpp
index b2be357c..f1ebd98d 100644
--- a/src/activities/browser/OpdsBookBrowserActivity.cpp
+++ b/src/activities/browser/OpdsBookBrowserActivity.cpp
@@ -398,7 +398,7 @@ void OpdsBookBrowserActivity::chooseBookFormat(const OpdsEntry& book) {
 
   selectedBookIndex = selectorIndex;
   formatSelectorIndex = 0;
-  formatSelectionLabels = buildOpdsFormatSelectionLabels(book.acquisitionLinks, SETTINGS.opdsServerUrl);
+  formatSelectionLabels = buildOpdsFormatSelectionLabels(book.acquisitionLinks, server.url);
   state = BrowserState::FORMAT_SELECTION;
   requestUpdate();
 }
@@ -413,7 +413,7 @@ void OpdsBookBrowserActivity::downloadBook(const OpdsEntry& book, const OpdsAcqu
 
   std::string downloadUrl = (acquisition.href.rfind("http", 0) == 0)
                                 ? acquisition.href
-                                : UrlUtils::buildUrl(SETTINGS.opdsServerUrl, acquisition.href);
+                                : UrlUtils::buildUrl(server.url, acquisition.href);
   std::string filename = "/" +
                          StringUtils::sanitizeFilename((book.author.empty() ? "" : book.author + " - ") + book.title) +
                          acquisition.fileExtension;