diff --git a/daemon.py b/daemon.py
index 2a7e0bd1b..285553596 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5807,8 +5807,9 @@ class PubServer(BaseHTTPRequestHandler):
                                         os.remove(self.server.baseDir +
                                                   '/fonts/custom.' + ext +
                                                   '.etag')
-                                setTheme(self.server.baseDir,
-                                         getTheme(self.server.baseDir))
+                                currTheme = getTheme(self.server.baseDir)
+                                if currTheme:
+                                    setTheme(self.server.baseDir, currTheme)
 
                         if fields.get('mediaInstance'):
                             self.server.mediaInstance = False