diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.kt b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
index b88a65cf2..4a4184a57 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.kt
@@ -335,7 +335,7 @@ object EhDB {
     @Synchronized
     fun addFilter(filter: Filter): Boolean {
         val existFilter: Filter? = try {
-            db.filterDao().load(filter.text!!, filter.mode)
+            db.filterDao().load(filter.text, filter.mode)
         } catch (e: Exception) {
             null
         }
@@ -355,7 +355,7 @@ object EhDB {
 
     @Synchronized
     fun triggerFilter(filter: Filter) {
-        filter.enable = filter.enable?.not() ?: false
+        filter.enable = !filter.enable
         db.filterDao().update(filter)
     }