diff --git a/gui/src/components/LoadingCard.tsx b/gui/src/components/LoadingCard.tsx
index 26186cf2..2066c1f2 100644
--- a/gui/src/components/LoadingCard.tsx
+++ b/gui/src/components/LoadingCard.tsx
@@ -62,7 +62,7 @@ export function LoadingCard(props: LoadingCardProps) {
 
   useEffect(() => {
     if (cancel.status === 'success') {
-      clearLoading();
+      clearLoading(props.loading);
     }
   }, [cancel.status]);
 
diff --git a/gui/src/state.ts b/gui/src/state.ts
index 8ed9aef4..21bf4fda 100644
--- a/gui/src/state.ts
+++ b/gui/src/state.ts
@@ -46,12 +46,14 @@ interface HistorySlice {
   limit: number;
   loading: Array<LoadingItem>;
 
-  // TODO: hack until setLoading removes things
-  clearLoading(): void;
+  clearLoading(image: ImageResponse): void;
   pushHistory(image: ImageResponse): void;
   pushLoading(image: ImageResponse): void;
   removeHistory(image: ImageResponse): void;
   setLimit(limit: number): void;
+  /**
+   * @todo should check ready and move the image from loading to history
+   */
   setReady(image: ImageResponse, ready: ReadyResponse): void;
 }
 
@@ -274,10 +276,10 @@ export function createStateSlices(server: ServerParams) {
     history: [],
     limit: DEFAULT_HISTORY.limit,
     loading: [],
-    clearLoading() {
+    clearLoading(image) {
       set((prev) => ({
         ...prev,
-        loading: [],
+        loading: prev.loading.filter((it) => it.image.output.key !== image.output.key),
       }));
     },
     pushHistory(image) {
@@ -287,7 +289,7 @@ export function createStateSlices(server: ServerParams) {
           image,
           ...prev.history,
         ].slice(0, prev.limit + DEFAULT_HISTORY.scrollback),
-        loading: [],
+        loading: prev.loading.filter((it) => it.image.output.key !== image.output.key),
       }));
     },
     pushLoading(image) {