diff --git a/daemon.py b/daemon.py
index 74e0fc5e2..0f50cf71e 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6723,6 +6723,8 @@ class PubServer(BaseHTTPRequestHandler):
         if isImageFile(path):
             emojiStr = path.split('/emoji/')[1]
             emojiFilename = baseDir + '/emoji/' + emojiStr
+            if not os.path.isfile(emojiFilename):
+                emojiFilename = baseDir + '/emojicustom/' + emojiStr
             if os.path.isfile(emojiFilename):
                 if self._etag_exists(emojiFilename):
                     # The file has not changed