diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
index 38c58aa9..a0cd0b17 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
@@ -49,7 +49,15 @@ import VDS
         if let closeButton = viewModel.closeButton {
             onCloseClick = { [weak self] _ in
                 guard let self else { return }
-                self.executeAction(model: closeButton, delegateObject: self.delegateObject, additionalData: self.additionalData)            }
+                if closeButton.action.actionType == ActionNoopModel.identifier {
+                    if var dismissAction = self.viewModel.closeButton {
+                        dismissAction.action = ActionDismissNotificationModel()
+                        self.executeAction(model: dismissAction, delegateObject: self.delegateObject, additionalData: self.additionalData)
+                    }
+                } else {
+                    self.executeAction(model: closeButton, delegateObject: self.delegateObject, additionalData: self.additionalData)
+                }
+            }
         }
         
         hideCloseButton = viewModel.closeButton == nil