diff --git a/src/blob.ts b/src/blob.ts
index 661c8e5..ebfa6fe 100644
--- a/src/blob.ts
+++ b/src/blob.ts
@@ -49,7 +49,7 @@ export const imageURLRequestHandler = async (req: Request, res: Response) => {
   if (upload_res.url) {
     const cache_to_cdn_response = await cacheArweaveImage(upload_res.url);
     if (!cache_to_cdn_response) {
-      res.status(500).json(cache_to_cdn_response);
+      return res.status(500).json(cache_to_cdn_response);
     }
     res.status(200).json(upload_res);
   } else {
diff --git a/src/form.ts b/src/form.ts
index 07db073..970feaa 100644
--- a/src/form.ts
+++ b/src/form.ts
@@ -76,13 +76,11 @@ const requestHandler = async (req: Request, res: Response) => {
   if (response.error) {
     res.status(500).json(response)
   } else {
-    if (response.url) {
-      const cache_to_cdn_response = await cacheArweaveImage(response.url);
-      if (!cache_to_cdn_response) {
-        res.status(500).json(cache_to_cdn_response);
-      }
-      res.status(200).json(response);
+    const cache_to_cdn_response = await cacheArweaveImage(response.url!);
+    if (!cache_to_cdn_response) {
+      return res.status(500).json(cache_to_cdn_response);
     }
+    res.status(200).json(response);
   }
 
 };