diff --git a/server/szurubooru/rest/app.py b/server/szurubooru/rest/app.py
index 2c219162..2c2b70b0 100644
--- a/server/szurubooru/rest/app.py
+++ b/server/szurubooru/rest/app.py
@@ -107,6 +107,7 @@ def application(env, start_response):
             'title': ex.title,
             'description': ex.description,
         }
-        for key, value in ex.extra_fields.items():
-            blob[key] = value
+        if ex.extra_fields is not None:
+            for key, value in ex.extra_fields.items():
+                blob[key] = value
         return (_dump_json(blob).encode('utf-8'),)