diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
index f6cdc0412fc..149c1270f2f 100644
--- a/ckan/config/deployment.ini_tmpl
+++ b/ckan/config/deployment.ini_tmpl
@@ -107,7 +107,7 @@ ckan.views.default_views = image_view text_view recline_view
 ckan.site_title = CKAN
 ckan.site_logo = /base/images/ckan-logo.png
 ckan.site_description =
-ckan.favicon = /images/icons/ckan.ico
+ckan.favicon = /base/images/icons/ckan.ico
 ckan.gravatar_default = identicon
 ckan.preview.direct = png jpg gif
 ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json
diff --git a/ckan/config/environment.py b/ckan/config/environment.py
index b287352c054..e6cec205d60 100644
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -246,7 +246,7 @@ def update_config():
         config['ckan.site_id'] = ckan_host
 
     # ensure that a favicon has been set
-    favicon = config.get('ckan.favicon', '/images/icons/ckan.ico')
+    favicon = config.get('ckan.favicon', '/base/images/icons/ckan.ico')
     config['ckan.favicon'] = favicon
 
     # Init SOLR settings and check if the schema is compatible