diff --git a/services/mam-api/src/routes/upload.js b/services/mam-api/src/routes/upload.js
index ae1d46f..c987f4d 100644
--- a/services/mam-api/src/routes/upload.js
+++ b/services/mam-api/src/routes/upload.js
@@ -103,7 +103,8 @@ router.post('/init', async (req, res, next) => {
     }
 
     const assetId = uuidv4();
-    const s3Key   = `originals/${projectId}/${filename}`;
+    // Include assetId in the key so same-named files in a project never collide
+    const s3Key   = `originals/${assetId}/${filename}`;
     const tagsArray = tags ? (Array.isArray(tags) ? tags : [tags]) : [];
 
     await pool.query(
@@ -259,7 +260,8 @@ router.post('/simple', upload.single('file'), async (req, res, next) => {
     }
 
     const assetId   = uuidv4();
-    const s3Key     = `originals/${projectId}/${filename}`;
+    // Include assetId in the key so same-named files in a project never collide
+    const s3Key     = `originals/${assetId}/${filename}`;
     const mimeType  = contentType || req.file.mimetype;
     const tagsArray = tags ? (Array.isArray(tags) ? tags : [tags]) : [];