diff --git a/app/models/site.rb b/app/models/site.rb
index a8c5e376..c40dd6f9 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -501,8 +501,8 @@ class Site < ApplicationRecord
     config.theme = design.gem unless design.no_theme?
     config.description = description
     config.title = title
-    config.url = url(slash: false)
-    config.hostname = hostname
+    config.url ||= url(slash: false)
+    config.hostname ||= hostname
     config.locales = locales.map(&:to_s)
   end