diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Collections.kt b/app/src/main/java/com/tangem/tap/common/extensions/Collections.kt
index a280071a02..d1c417e842 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Collections.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Collections.kt
@@ -8,4 +8,10 @@ fun <T> List<T>.containsAny(list: List<T>): Boolean {
         list.forEach { if (it == mainItem) return true }
     }
     return false
+}
+
+fun <T> MutableList<T>.removeBy(predicate: (T) -> Boolean): Boolean {
+    val toRemove = this.filter(predicate)
+    this.removeAll(toRemove)
+    return toRemove.isNotEmpty()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
index 0e48e115e1..86b1cf4eff 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
@@ -3,6 +3,7 @@ package com.tangem.tap.domain.configurable.warningMessage
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.tangem_sdk_new.ui.animation.VoidCallback
 import com.tangem.tap.common.extensions.containsAny
+import com.tangem.tap.common.extensions.removeBy
 import com.tangem.wallet.R
 
 /**
@@ -61,12 +62,12 @@ class WarningMessagesManager(
     }
 
     fun removeWarnings(origin: WarningMessage.Origin) {
-        warningsList.removeIf { it.origin == origin }
+        warningsList.removeBy { it.origin == origin }
         sortByPriority()
     }
 
     fun removeWarnings(messageRes: Int) {
-        warningsList.removeIf { it.messageResId == messageRes }
+        warningsList.removeBy { it.messageResId == messageRes }
     }
 
     private fun sortByPriority() {