diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
index f541dd007..540833e51 100644
--- a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
+++ b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt
@@ -48,6 +48,8 @@ class AddressableTest {
     @After
     fun tearDown() {
         db.close()
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        context.deleteDatabase("test.db")
     }
 
     @Test
diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
index 7bf8d362d..53277c750 100644
--- a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
+++ b/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt
@@ -63,6 +63,8 @@ class LargeDBTests {
     @After
     fun tearDown() {
         db.close()
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        context.deleteDatabase("test_large.db")
     }
 
     @Test
diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt
index 0bd3026c2..961acbbcd 100644
--- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt
+++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt
@@ -179,9 +179,13 @@ class EventIndexesModule(
         filter: Filter,
         db: SQLiteDatabase,
     ): List<Event> {
-        val rowIdSubQuery = prepareRowIDSubQueries(filter) ?: return db.runQuery(makeEverythingQuery())
+        val rowIdSubQuery = prepareRowIDSubQueries(filter)
 
-        return db.runQuery(makeQueryIn(rowIdSubQuery.sql), rowIdSubQuery.args)
+        return if (rowIdSubQuery == null) {
+            db.runQuery(makeEverythingQuery())
+        } else {
+            db.runQuery(makeQueryIn(rowIdSubQuery.sql), rowIdSubQuery.args)
+        }
     }
 
     fun query(