diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 4c9046cac..60086eca0 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -245,28 +245,28 @@
 +|    |    \--- dev.zacsweers.redacted:redacted-compiler-plugin-annotations-jvm:1.13.0
 +|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.21 (*)
-+|    +--- androidx.room:room-runtime:2.8.3
-+|    |    \--- androidx.room:room-runtime-android:2.8.3
++|    +--- androidx.room:room-runtime:2.8.4
++|    |    \--- androidx.room:room-runtime-android:2.8.4
 +|    |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         +--- androidx.annotation:annotation-experimental:1.5.0 -> 1.5.1
 +|    |         |    +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
 +|    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.2.21 (c)
 +|    |         +--- androidx.arch.core:core-runtime:2.2.0 (*)
 +|    |         +--- androidx.collection:collection:1.5.0 (*)
-+|    |         +--- androidx.room:room-common:2.8.3
-+|    |         |    \--- androidx.room:room-common-jvm:2.8.3
++|    |         +--- androidx.room:room-common:2.8.4
++|    |         |    \--- androidx.room:room-common-jvm:2.8.4
 +|    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-+|    |         |         +--- androidx.room:room-runtime:2.8.3 (c)
++|    |         |         +--- androidx.room:room-runtime:2.8.4 (c)
 +|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-+|    |         +--- androidx.sqlite:sqlite:2.6.1 -> 2.6.2
++|    |         +--- androidx.sqlite:sqlite:2.6.2
 +|    |         |    \--- androidx.sqlite:sqlite-android:2.6.2
 +|    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
 +|    |         |         +--- androidx.sqlite:sqlite-framework:2.6.2 (c)
 +|    |         |         +--- androidx.sqlite:sqlite-bundled:2.6.2 (c)
 +|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-+|    |         +--- androidx.sqlite:sqlite-framework:2.6.1 -> 2.6.2
++|    |         +--- androidx.sqlite:sqlite-framework:2.6.2
 +|    |         |    \--- androidx.sqlite:sqlite-framework-android:2.6.2
 +|    |         |         +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*)
 +|    |         |         +--- androidx.sqlite:sqlite:2.6.2 (*)
@@ -278,7 +278,7 @@
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -> 1.10.2 (*)
 +|    |         +--- org.jspecify:jspecify:1.0.0
-+|    |         +--- androidx.room:room-common:2.8.3 (c)
++|    |         +--- androidx.room:room-common:2.8.4 (c)
 +|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
 +|    +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
@@ -1342,7 +1342,7 @@
 +|    |    +--- androidx.core:core:1.12.0 -> 1.16.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.9.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.9.4 (*)
-+|    |    +--- androidx.room:room-runtime:2.7.0 -> 2.8.3 (*)
++|    |    +--- androidx.room:room-runtime:2.7.0 -> 2.8.4 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 -> 1.2.0 (*)
 +|    |    +--- androidx.tracing:tracing-ktx:1.2.0
 +|    |    |    +--- androidx.tracing:tracing:1.2.0 (*)
@@ -1383,7 +1383,7 @@
 ++--- androidx.lifecycle:lifecycle-runtime:2.9.4 (*)
 ++--- androidx.lifecycle:lifecycle-runtime-compose:2.9.4 (*)
 ++--- androidx.lifecycle:lifecycle-viewmodel:2.9.4 (*)
-++--- androidx.room:room-runtime:2.8.3 (*)
+++--- androidx.room:room-runtime:2.8.4 (*)
 ++--- androidx.sqlite:sqlite-bundled:2.6.2
 +|    \--- androidx.sqlite:sqlite-bundled-android:2.6.2
 +|         +--- androidx.sqlite:sqlite:2.6.2 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 22c88d421..e82ac4adf 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -886,26 +886,26 @@
 +|    |    \--- dev.zacsweers.redacted:redacted-compiler-plugin-annotations-jvm:1.13.0
 +|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.21 (*)
-+|    +--- androidx.room:room-runtime:2.8.3
-+|    |    \--- androidx.room:room-runtime-android:2.8.3
++|    +--- androidx.room:room-runtime:2.8.4
++|    |    \--- androidx.room:room-runtime-android:2.8.4
 +|    |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         +--- androidx.annotation:annotation-experimental:1.5.0 -> 1.5.1 (*)
 +|    |         +--- androidx.arch.core:core-runtime:2.2.0 (*)
 +|    |         +--- androidx.collection:collection:1.5.0 (*)
-+|    |         +--- androidx.room:room-common:2.8.3
-+|    |         |    \--- androidx.room:room-common-jvm:2.8.3
++|    |         +--- androidx.room:room-common:2.8.4
++|    |         |    \--- androidx.room:room-common-jvm:2.8.4
 +|    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-+|    |         |         +--- androidx.room:room-runtime:2.8.3 (c)
++|    |         |         +--- androidx.room:room-runtime:2.8.4 (c)
 +|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-+|    |         +--- androidx.sqlite:sqlite:2.6.1 -> 2.6.2
++|    |         +--- androidx.sqlite:sqlite:2.6.2
 +|    |         |    \--- androidx.sqlite:sqlite-android:2.6.2
 +|    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
 +|    |         |         +--- androidx.sqlite:sqlite-framework:2.6.2 (c)
 +|    |         |         +--- androidx.sqlite:sqlite-bundled:2.6.2 (c)
 +|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-+|    |         +--- androidx.sqlite:sqlite-framework:2.6.1 -> 2.6.2
++|    |         +--- androidx.sqlite:sqlite-framework:2.6.2
 +|    |         |    \--- androidx.sqlite:sqlite-framework-android:2.6.2
 +|    |         |         +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*)
 +|    |         |         +--- androidx.sqlite:sqlite:2.6.2 (*)
@@ -917,7 +917,7 @@
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -> 1.10.2 (*)
 +|    |         +--- org.jspecify:jspecify:1.0.0
-+|    |         +--- androidx.room:room-common:2.8.3 (c)
++|    |         +--- androidx.room:room-common:2.8.4 (c)
 +|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
 +|    +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
@@ -1734,7 +1734,7 @@
 +|    |    +--- androidx.core:core:1.12.0 -> 1.16.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.9.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.9.4 (*)
-+|    |    +--- androidx.room:room-runtime:2.7.0 -> 2.8.3 (*)
++|    |    +--- androidx.room:room-runtime:2.7.0 -> 2.8.4 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 -> 1.2.0 (*)
 +|    |    +--- androidx.tracing:tracing-ktx:1.2.0
 +|    |    |    +--- androidx.tracing:tracing:1.2.0 (*)
@@ -1775,7 +1775,7 @@
 ++--- androidx.lifecycle:lifecycle-runtime:2.9.4 (*)
 ++--- androidx.lifecycle:lifecycle-runtime-compose:2.9.4 (*)
 ++--- androidx.lifecycle:lifecycle-viewmodel:2.9.4 (*)
-++--- androidx.room:room-runtime:2.8.3 (*)
+++--- androidx.room:room-runtime:2.8.4 (*)
 ++--- androidx.sqlite:sqlite-bundled:2.6.2
 +|    \--- androidx.sqlite:sqlite-bundled-android:2.6.2
 +|         +--- androidx.sqlite:sqlite:2.6.2 (*)
diff --git a/deps_wear.txt b/deps_wear.txt
index fd6eda1f8..bab7c70df 100644
--- a/deps_wear.txt
+++ b/deps_wear.txt
@@ -879,36 +879,36 @@
 +|    |    |    \--- dev.zacsweers.redacted:redacted-compiler-plugin-annotations-jvm:1.13.0
 +|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.20 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.20 (*)
-+|    |    +--- androidx.room:room-runtime:2.8.3
-+|    |    |    \--- androidx.room:room-runtime-android:2.8.3
++|    |    +--- androidx.room:room-runtime:2.8.4
++|    |    |    \--- androidx.room:room-runtime-android:2.8.4
 +|    |    |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |    |         +--- androidx.annotation:annotation-experimental:1.5.0 (*)
 +|    |    |         +--- androidx.arch.core:core-runtime:2.2.0 (*)
 +|    |    |         +--- androidx.collection:collection:1.5.0 (*)
-+|    |    |         +--- androidx.room:room-common:2.8.3
-+|    |    |         |    \--- androidx.room:room-common-jvm:2.8.3
++|    |    |         +--- androidx.room:room-common:2.8.4
++|    |    |         |    \--- androidx.room:room-common-jvm:2.8.4
 +|    |    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.20 (*)
-+|    |    |         |         +--- androidx.room:room-runtime:2.8.3 (c)
++|    |    |         |         +--- androidx.room:room-runtime:2.8.4 (c)
 +|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.20 (c)
-+|    |    |         +--- androidx.sqlite:sqlite:2.6.1
-+|    |    |         |    \--- androidx.sqlite:sqlite-android:2.6.1
++|    |    |         +--- androidx.sqlite:sqlite:2.6.2
++|    |    |         |    \--- androidx.sqlite:sqlite-android:2.6.2
 +|    |    |         |         +--- androidx.annotation:annotation:1.9.1 (*)
 +|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.20 (*)
-+|    |    |         |         +--- androidx.sqlite:sqlite-framework:2.6.1 (c)
++|    |    |         |         +--- androidx.sqlite:sqlite-framework:2.6.2 (c)
 +|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.20 (c)
-+|    |    |         +--- androidx.sqlite:sqlite-framework:2.6.1
-+|    |    |         |    \--- androidx.sqlite:sqlite-framework-android:2.6.1
++|    |    |         +--- androidx.sqlite:sqlite-framework:2.6.2
++|    |    |         |    \--- androidx.sqlite:sqlite-framework-android:2.6.2
 +|    |    |         |         +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*)
-+|    |    |         |         +--- androidx.sqlite:sqlite:2.6.1 (*)
++|    |    |         |         +--- androidx.sqlite:sqlite:2.6.2 (*)
 +|    |    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.20 (*)
-+|    |    |         |         +--- androidx.sqlite:sqlite:2.6.1 (c)
++|    |    |         |         +--- androidx.sqlite:sqlite:2.6.2 (c)
 +|    |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.20 (c)
 +|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.20 (*)
 +|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
 +|    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -> 1.10.2 (*)
 +|    |    |         +--- org.jspecify:jspecify:1.0.0
-+|    |    |         +--- androidx.room:room-common:2.8.3 (c)
++|    |    |         +--- androidx.room:room-common:2.8.4 (c)
 +|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.20 (c)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 52fc381c7..0e85f8b77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,7 @@ preference = "1.2.1"
 protobuf = "4.33.1"
 recyclerview = "1.4.0"
 rfc5545-datetime = "0.2.4"
-room = "2.8.3"
+room = "2.8.4"
 shortcut-badger = "1.1.22"
 timber = "5.0.1"
 swiperefreshlayout = "1.1.0"