diff --git a/mindspace-assets.mjs b/mindspace-assets.mjs
index 955bd58..b21c94c 100644
--- a/mindspace-assets.mjs
+++ b/mindspace-assets.mjs
@@ -10,7 +10,8 @@ import {
   scheduleHtmlThumbnail,
 } from './mindspace-thumbnails.mjs';
 import { removeZoneMirror, resolveUserWorkspaceRoot } from './user-space.mjs';
-import { PUBLIC_ZONE_DIR, PUBLISH_ROOT_DIR, resolvePublicBaseUrl } from './user-publish.mjs';
+import { PUBLIC_ZONE_DIR, resolvePublicBaseUrl } from './user-publish.mjs';
+import { createMindSpacePublicUrl } from './mindspace-canonical-url.mjs';
 import {
   buildPublicImagePaths,
   buildUserImagePublicUrl,
@@ -218,7 +219,11 @@ function publicTempImageStorageKey(userId, assetId, mimeType, fallbackFilename =
 
 function publicTempImageUrl(userId, assetId, mimeType, fallbackFilename = '') {
   const filename = publicTempImageFilename(assetId, mimeType, fallbackFilename);
-  return `${resolvePublicBaseUrl()}/${PUBLISH_ROOT_DIR}/${encodeURIComponent(userId)}/${PUBLIC_ZONE_DIR}/${PUBLIC_TEMP_IMAGE_DIR}/${encodeURIComponent(filename)}`;
+  return createMindSpacePublicUrl({
+    publicBaseUrl: resolvePublicBaseUrl(),
+    ownerKey: userId,
+    relativePath: `${PUBLIC_ZONE_DIR}/${PUBLIC_TEMP_IMAGE_DIR}/${filename}`,
+  });
 }
 
 function assetResponse(row) {