diff --git a/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx b/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx
index 483c0f413e..75105ca579 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx
@@ -16,9 +16,9 @@ export const useAssetsState = (baseAssets: Array<Asset>) => {
   const [assets, setAssets] = useState<Asset[]>(baseAssets);
 
   useEffect(() => {
-    if (imageChanges?.uploadAssets?.length) {
+    if (imageChanges?.uploadedAssets?.length) {
       setAssets((currentAssets) => [
-        ...imageChanges.uploadAsset,
+        ...imageChanges.uploadedAssets,
         ...currentAssets.filter((asset) => asset.status !== "uploading"),
       ]);
     }
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/image.tsx b/apps/designer/app/designer/features/sidebar-left/panels/components/image.tsx
index 1a270b9c65..84bf91b0eb 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/components/image.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/components/image.tsx
@@ -83,33 +83,35 @@ export const AssetManagerImage = ({
           ...(isUploading ? { filter: "blur(1px)", opacity: 0.7 } : {}),
         }}
       ></Box>
-      <Tooltip
-        css={{ maxWidth: "$10" }}
-        open={isToolTipOpen}
-        multiline
-        content={
-          <Flex direction="column" gap={1} align="center" justify="center">
-            Are you sure you want to delete this asset?
-            <Button variant="red" onClick={deleteAsset}>
-              Delete
-            </Button>
-          </Flex>
-        }
-      >
-        <Button
-          variant="raw"
-          onClick={() => setTolltipOpen(true)}
-          css={{
-            position: "absolute",
-            top: "$1",
-            right: "$1",
-            cursor: "pointer",
-            color: "$highContrast",
-          }}
+      {!isUploading && (
+        <Tooltip
+          css={{ maxWidth: "$10" }}
+          open={isToolTipOpen}
+          multiline
+          content={
+            <Flex direction="column" gap={1} align="center" justify="center">
+              Are you sure you want to delete this asset?
+              <Button variant="red" onClick={deleteAsset}>
+                Delete
+              </Button>
+            </Flex>
+          }
         >
-          <Cross2Icon />
-        </Button>
-      </Tooltip>
+          <Button
+            variant="raw"
+            onClick={() => setTolltipOpen(true)}
+            css={{
+              position: "absolute",
+              top: "$1",
+              right: "$1",
+              cursor: "pointer",
+              color: "$highContrast",
+            }}
+          >
+            <Cross2Icon />
+          </Button>
+        </Tooltip>
+      )}
       {isUploading && (
         <ProgressBar
           value={progressBarPercentage}