diff --git a/lib/structs/events/common.cpp b/lib/structs/events/common.cpp
index a1d1b60d18e0f766abdd996f0133b71b444e3aa2..bd70df5c5bf8d3a3c227f814349a191f1649c62e 100644
--- a/lib/structs/events/common.cpp
+++ b/lib/structs/events/common.cpp
@@ -64,8 +64,10 @@ to_json(json &obj, const ImageInfo &info)
         obj["w"]              = info.w;
         obj["size"]           = info.size;
         obj["mimetype"]       = info.mimetype;
-        obj["thumbnail_url"]  = info.thumbnail_url;
-        obj["thumbnail_info"] = info.thumbnail_info;
+        if (!info.thumbnail_url.empty()) {
+          obj["thumbnail_url"]  = info.thumbnail_url;
+          obj["thumbnail_info"] = info.thumbnail_info;
+        }
         if (info.thumbnail_file)
                 obj["thumbnail_file"] = info.thumbnail_file.value();
 }
@@ -94,8 +96,10 @@ to_json(json &obj, const FileInfo &info)
 {
         obj["size"]           = info.size;
         obj["mimetype"]       = info.mimetype;
-        obj["thumbnail_url"]  = info.thumbnail_url;
-        obj["thumbnail_info"] = info.thumbnail_info;
+        if (!info.thumbnail_url.empty()) {
+          obj["thumbnail_url"] = info.thumbnail_url;
+          obj["thumbnail_info"] = info.thumbnail_info;
+        }
         if (info.thumbnail_file)
                 obj["thumbnail_file"] = info.thumbnail_file.value();
 }