diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
index a4bb580c..82f4fbab 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
@@ -23,7 +23,7 @@ interface PacketDao {
     fun getMessagesFrom(contact: String): Flow<List<Packet>>
 
     @Query("Select * from packet where data = :data")
-    fun findDataPacket(data: DataPacket): Packet
+    fun findDataPacket(data: DataPacket): Packet?
 
     @Query("Delete from packet where port_num = 1")
     fun deleteAllMessages()
@@ -45,6 +45,6 @@ interface PacketDao {
     @Transaction
     fun updateMessageStatus(data: DataPacket, m: MessageStatus) {
         val new = data.copy(status = m)
-        update(findDataPacket(data).copy(data = new))
+        findDataPacket(data)?.let { update(it.copy(data = new)) }
     }
 }