diff --git a/content.py b/content.py
index 360920f90..ac281212f 100644
--- a/content.py
+++ b/content.py
@@ -904,8 +904,9 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
                 if os.path.isfile(baseDir + '/emojicustom/emoji.json'):
                     customEmojiDict = \
                         loadJson(baseDir + '/emojicustom/emoji.json')
-                    emojiDict = \
-                        dict(emojiDict.items() + customEmojiDict.items())
+                    if customEmojiDict:
+                        emojiDict = \
+                            dict(emojiDict.items() + customEmojiDict.items())
 
 #                print('TAG: looking up emoji for :' + wordStr2 + ':')
                 _addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix,