diff --git a/apps/client/src/services/toast.ts b/apps/client/src/services/toast.ts
index 1278d1d44..abbbfff42 100644
--- a/apps/client/src/services/toast.ts
+++ b/apps/client/src/services/toast.ts
@@ -43,7 +43,7 @@ export function showError(message: string, timeout = 10000) {
         icon: "bx bx-error-circle",
         message,
         timeout
-    })
+    });
 }
 
 function showErrorTitleAndMessage(title: string, message: string, timeout = 10000) {
@@ -73,7 +73,7 @@ function updateToast(id: string, partial: Partial<ToastOptions>) {
             return { ...toast, ...partial }
         }
         return toast;
-    })
+    });
 }
 
 export function removeToastFromStore(id: string) {
diff --git a/apps/client/src/widgets/Toast.css b/apps/client/src/widgets/Toast.css
index 6431ceea2..457aadce2 100644
--- a/apps/client/src/widgets/Toast.css
+++ b/apps/client/src/widgets/Toast.css
@@ -55,5 +55,5 @@
     inset-inline-end: 0;
     background-color: var(--toast-text-color) !important;
     height: 4px;
-    transition: width 0.1s linear;    
+    transition: width 0.1s linear;
 }
diff --git a/apps/client/src/widgets/Toast.tsx b/apps/client/src/widgets/Toast.tsx
index 2bdf7baae..62bfe78fd 100644
--- a/apps/client/src/widgets/Toast.tsx
+++ b/apps/client/src/widgets/Toast.tsx
@@ -23,7 +23,12 @@ function Toast({ id, title, timeout, progress, message, icon }: ToastOptionsWith
         return () => clearTimeout(timerId);
     }, [ id, timeout ]);
 
-    const closeButton = <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close" />;
+    const closeButton = (
+        <button
+            type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"
+            onClick={() => removeToastFromStore(id)}
+        />
+    );
     const toastIcon = <Icon icon={icon.startsWith("bx ") ? icon : `bx bx-${icon}`} />;
 
     return (
diff --git a/apps/client/src/widgets/basic_widget.ts b/apps/client/src/widgets/basic_widget.ts
index 37049d725..3c9788943 100644
--- a/apps/client/src/widgets/basic_widget.ts
+++ b/apps/client/src/widgets/basic_widget.ts
@@ -185,7 +185,7 @@ export class TypedBasicWidget<T extends TypedComponent<any>> extends TypedCompon
             });
         } else {
             toastService.showPersistent({
-                id: `custom-widget-failure-${noteId}`,
+                id: `custom-widget-failure-unknown-${crypto.randomUUID()}`,
                 title: t("toast.widget-error.title"),
                 icon: "bx bx-error-circle",
                 message: t("toast.widget-error.message-unknown", {