diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 1af10fa8..c4ddd250 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -816,7 +816,8 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
         addElement('web', app['Web Site'], doc, apel)
         addElement('source', app['Source Code'], doc, apel)
         addElement('tracker', app['Issue Tracker'], doc, apel)
-        addElement('changelog', app['Changelog'], doc, apel)
+        if app['Changelog']:
+            addElement('changelog', app['Changelog'], doc, apel)
         if app['Donate']:
             addElement('donate', app['Donate'], doc, apel)
         if app['Bitcoin']: