diff --git a/services/web/app/src/Features/Compile/ClsiCacheHandler.mjs b/services/web/app/src/Features/Compile/ClsiCacheHandler.mjs
index dc9545220e..ac1960de93 100644
--- a/services/web/app/src/Features/Compile/ClsiCacheHandler.mjs
+++ b/services/web/app/src/Features/Compile/ClsiCacheHandler.mjs
@@ -241,7 +241,6 @@ async function prepareCacheSource(
   userId,
   { sourceProjectId, templateVersionId, imageName, lastUpdated, shard, signal }
 ) {
-  imageName = Path.basename(imageName)
   const url = new URL(
     `/project/${projectId}/user/${userId}/import-from`,
     Settings.apis.clsiCache.instances.find(i => i.shard === shard).url
diff --git a/services/web/app/src/Features/Templates/TemplatesManager.mjs b/services/web/app/src/Features/Templates/TemplatesManager.mjs
index aac5732505..eaaada1419 100644
--- a/services/web/app/src/Features/Templates/TemplatesManager.mjs
+++ b/services/web/app/src/Features/Templates/TemplatesManager.mjs
@@ -15,6 +15,7 @@ import crypto from 'node:crypto'
 import Errors from '../Errors/Errors.js'
 import { pipeline } from 'node:stream/promises'
 import ClsiCacheManager from '../Compile/ClsiCacheManager.mjs'
+import Path from 'node:path'
 
 const { promises: ProjectRootDocManager } = ProjectRootDocManagerModule
 const { promises: ProjectOptionsHandler } = ProjectOptionsHandlerModule
@@ -76,7 +77,7 @@ const TemplatesManager = {
       const prepareClsiCacheInBackground = ClsiCacheManager.prepareClsiCache(
         project._id,
         userId,
-        { templateVersionId, imageName }
+        { templateVersionId, imageName: imageName && Path.basename(imageName) }
       ).catch(err => {
         logger.warn(
           { err, templateVersionId, projectId: project._id },