diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt
index 6576607c7..07215f83b 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/FirmwareReleaseDao.kt
@@ -33,8 +33,8 @@ interface FirmwareReleaseDao {
     suspend fun deleteAll()
 
     @Query("SELECT * FROM firmware_release")
-    suspend fun getAllReleases(): List<FirmwareReleaseEntity>?
+    suspend fun getAllReleases(): List<FirmwareReleaseEntity>
 
     @Query("SELECT * FROM firmware_release WHERE release_type = :releaseType")
-    suspend fun getReleasesByType(releaseType: FirmwareReleaseType): List<FirmwareReleaseEntity>?
+    suspend fun getReleasesByType(releaseType: FirmwareReleaseType): List<FirmwareReleaseEntity>
 }
diff --git a/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt b/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt
index fd723e69c..f5ddb6e93 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/api/FirmwareReleaseLocalDataSource.kt
@@ -52,7 +52,7 @@ class FirmwareReleaseLocalDataSource @Inject constructor(
     suspend fun getLatestRelease(releaseType: FirmwareReleaseType): FirmwareReleaseEntity? =
         withContext(Dispatchers.IO) {
             val releases = firmwareReleaseDao.getReleasesByType(releaseType)
-            if (releases.isNullOrEmpty()) {
+            if (releases.isEmpty()) {
                 return@withContext null
             } else {
                 val latestRelease =