diff --git a/build/server/main.js b/build/server/main.js
index 6f7b0f2..116ee7d 100644
--- a/build/server/main.js
+++ b/build/server/main.js
@@ -2057,7 +2057,8 @@ app.post('/api/upload', (req, res) => {
             created: Time.timestamp(),
         });
         if (req.body.tags) {
-            setImageTags(db, imageId, req.body.tags);
+            const tags = req.body.tags.split(',').filter((tag) => !!tag);
+            setImageTags(db, imageId, tags);
         }
         res.send(Images.imageFromDb(db, imageId));
     });
diff --git a/src/server/main.ts b/src/server/main.ts
index 4bfbfb8..a5018c9 100644
--- a/src/server/main.ts
+++ b/src/server/main.ts
@@ -182,7 +182,8 @@ app.post('/api/upload', (req, res): void => {
     })
 
     if (req.body.tags) {
-      setImageTags(db, imageId as number, req.body.tags)
+      const tags = req.body.tags.split(',').filter((tag: string) => !!tag)
+      setImageTags(db, imageId as number, tags)
     }
 
     res.send(Images.imageFromDb(db, imageId as number))