diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
index 4b1688db68..aac98e4536 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -1529,7 +1529,12 @@ public class RecipientDatabase extends Database {
     try (Cursor cursor = db.query(TABLE_NAME, new String[] {LAST_SESSION_RESET}, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) {
       if (cursor.moveToFirst()) {
         try {
-          return DeviceLastResetTime.parseFrom(CursorUtil.requireBlob(cursor, LAST_SESSION_RESET));
+          byte[] serialized = CursorUtil.requireBlob(cursor, LAST_SESSION_RESET);
+          if (serialized != null) {
+            return DeviceLastResetTime.parseFrom(serialized);
+          } else {
+            return DeviceLastResetTime.newBuilder().build();
+          }
         } catch (InvalidProtocolBufferException | SQLException e) {
           Log.w(TAG, e);
           return DeviceLastResetTime.newBuilder().build();