diff --git a/api/chalicelib/core/canvas.py b/api/chalicelib/core/canvas.py
index b3f1a3a0de..b13105989a 100644
--- a/api/chalicelib/core/canvas.py
+++ b/api/chalicelib/core/canvas.py
@@ -15,9 +15,15 @@ def get_canvas_presigned_urls(session_id, project_id):
         rows = cur.fetchall()
 
         for i in range(len(rows)):
-            rows.append(StorageClient.get_presigned_url_for_sharing(
+            params = {
+                "sessionId": session_id,
+                "projectId": project_id,
+                "recordingId": rows[i]["recording_id"]
+            }
+            key = config("CANVAS_PATTERN", default="%(sessionId)/%(recordingId)s.mp4") % params
+            rows[i] = StorageClient.get_presigned_url_for_sharing(
                 bucket=config("CANVAS_BUCKET", default=config("sessions_bucket")),
                 expires_in=config("PRESIGNED_URL_EXPIRATION", cast=int, default=900),
-                key=rows[i]
-            ))
+                key=key
+            )
         return rows