diff --git a/app/src/main/java/com/vitorpamplona/amethyst/OptOutFromFilters.kt b/app/src/main/java/com/vitorpamplona/amethyst/OptOutFromFilters.kt
deleted file mode 100644
index 262cdb255..000000000
--- a/app/src/main/java/com/vitorpamplona/amethyst/OptOutFromFilters.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vitorpamplona.amethyst
-
-object OptOutFromFilters {
-    var filterSpamFromStrangers: Boolean = true
-
-    fun start(filterSpam: Boolean) {
-        filterSpamFromStrangers = filterSpam
-    }
-}
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt b/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
index 173070703..123381c36 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
@@ -64,7 +64,7 @@ class ServiceManager {
 
         // Resets Proxy Use
         HttpClient.start(account?.proxy)
-        OptOutFromFilters.start(account?.filterSpamFromStrangers ?: true)
+        LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
         Coil.setImageLoader {
             Amethyst.instance.imageLoaderBuilder().components {
                 if (Build.VERSION.SDK_INT >= 28) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index c683c516a..85b1a89e6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -11,7 +11,6 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.liveData
 import androidx.lifecycle.switchMap
 import com.vitorpamplona.amethyst.Amethyst
-import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
@@ -426,7 +425,7 @@ class Account(
     fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) {
         warnAboutPostsWithReports = warnReports
         filterSpamFromStrangers = filterSpam
-        OptOutFromFilters.start(filterSpamFromStrangers)
+        LocalCache.antiSpam.active = filterSpamFromStrangers
         if (!filterSpamFromStrangers) {
             transientHiddenUsers = persistentSetOf()
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt
index dab9a1473..b0c51b986 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt
@@ -4,7 +4,6 @@ import android.util.Log
 import android.util.LruCache
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -19,10 +18,12 @@ class AntiSpamFilter {
     val recentMessages = LruCache<Int, String>(1000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
+    var active: Boolean = true
+
     fun isSpam(event: Event, relay: Relay?): Boolean {
         checkNotInMainThread()
 
-        if (!OptOutFromFilters.filterSpamFromStrangers) return false
+        if (!active) return false
 
         val idHex = event.id