diff --git a/CHANGELOG b/CHANGELOG
index 438bbf1..65121b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ omnibus-gitlab repository.
 - Add a 'gitlab-ctl deploy-page' command
 - Automatically create /etc/gitlab/gitlab.rb after the package is installed
 - Security: Use sockets and peer authentication for Postgres
+- Avoid empty Piwik or Google Analytics settings
 
 6.9.4-ee.omnibus.1
 - Security: Use sockets and peer authentication for Postgres
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index 403e32e..5874d23 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -244,12 +244,16 @@ production: &base
   # ==========================
 
   extra:
+    <% if @extra_google_analytics_id %>
     ## Google analytics. Uncomment if you want it
     google_analytics_id: <%= single_quote(@extra_google_analytics_id) %>
+    <% end %>
 
+    <% if @extra_piwik_url %>
     ## Piwik analytics.
     piwik_url: <%= single_quote(@extra_piwik_url) %>
     piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
+    <% end %>
 
     <% if @extra_sign_in_text %>
     ## Text under sign-in page (Markdown enabled)
--
libgit2 0.21.2