diff --git a/packages/storage-vercel-blob/src/client/VercelBlobClientUploadHandler.ts b/packages/storage-vercel-blob/src/client/VercelBlobClientUploadHandler.ts
index f283d2447..1edbac81e 100644
--- a/packages/storage-vercel-blob/src/client/VercelBlobClientUploadHandler.ts
+++ b/packages/storage-vercel-blob/src/client/VercelBlobClientUploadHandler.ts
@@ -30,5 +30,7 @@ export const VercelBlobClientUploadHandler =
       if (addRandomSuffix) {
         updateFilename(result.url.replace(`${baseURL}/`, ''))
       }
+
+      return { prefix }
     },
   })
diff --git a/packages/storage-vercel-blob/src/index.ts b/packages/storage-vercel-blob/src/index.ts
index a2480c697..dccdd6fb9 100644
--- a/packages/storage-vercel-blob/src/index.ts
+++ b/packages/storage-vercel-blob/src/index.ts
@@ -112,7 +112,8 @@ export const vercelBlobStorage: VercelBlobStoragePlugin =
       extraClientHandlerProps: (collection) => ({
         addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,
         baseURL: baseUrl,
-        prefix: (typeof collection === 'object' && collection.prefix) || '',
+        prefix:
+          (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',
       }),
       serverHandler: getClientUploadRoute({
         access:
diff --git a/packages/storage-vercel-blob/src/staticHandler.ts b/packages/storage-vercel-blob/src/staticHandler.ts
index 008576f33..1e3c8030c 100644
--- a/packages/storage-vercel-blob/src/staticHandler.ts
+++ b/packages/storage-vercel-blob/src/staticHandler.ts
@@ -15,11 +15,10 @@ export const getStaticHandler = (
   { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,
   collection: CollectionConfig,
 ): StaticHandler => {
-  return async (req, { params: { filename } }) => {
+  return async (req, { params: { clientUploadContext, filename } }) => {
     try {
-      const prefix = await getFilePrefix({ collection, filename, req })
+      const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })
       const fileKey = path.posix.join(prefix, encodeURIComponent(filename))
-
       const fileUrl = `${baseUrl}/${fileKey}`
       const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')
       const blobMetadata = await head(fileUrl, { token })