diff --git a/libtextsecure/libsignal-protocol.js b/libtextsecure/libsignal-protocol.js
index ac9b7fd7b..a9a47a80b 100644
--- a/libtextsecure/libsignal-protocol.js
+++ b/libtextsecure/libsignal-protocol.js
@@ -36185,7 +36185,8 @@ SessionCipher.prototype = {
             var errors = [];
             return this.decryptWithSessionList(buffer, record.getSessions(), errors).then(function(result) {
                 return this.getRecord(address).then(function(record) {
-                    if (result.session.indexInfo.baseKey !== record.getOpenSession().indexInfo.baseKey) {
+                    var openSession = record.getOpenSession();
+                    if (!openSession || result.session.indexInfo.baseKey !== openSession.indexInfo.baseKey) {
                       record.archiveCurrentState();
                       record.promoteState(result.session);
                     }