diff --git a/app/build.gradle b/app/build.gradle
index 7c750efbe..d02bcfd85 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -340,7 +340,7 @@ dependencies {
     implementation project(':video')
 
     implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.1.5'
+    implementation 'org.whispersystems:signal-client-android:0.2.2'
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
     implementation 'org.signal:argon2:13.1@aar'
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
index addf46804..28ab63b56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
@@ -60,8 +60,8 @@ public class TextSecureSessionStore implements SessionStore {
         SessionRecord sessionRecord = DatabaseFactory.getSessionDatabase(context).load(recipientId, address.getDeviceId());
 
         return sessionRecord != null &&
-               sessionRecord.getSessionState().hasSenderChain() &&
-               sessionRecord.getSessionState().getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
+               sessionRecord.hasSenderChain() &&
+               sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
       } else {
         return false;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
index 6fcec92c8..db106c45b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
@@ -10,7 +10,6 @@ import org.signal.core.util.Conversions;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SessionState;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.File;
@@ -64,9 +63,7 @@ class SessionStoreMigrationHelper {
 
             if (versionMarker == SINGLE_STATE_VERSION) {
               Log.i(TAG, "Migrating single state version: " + sessionFile.getAbsolutePath());
-              SessionState sessionState = new SessionState(serialized);
-
-              sessionRecord = new SessionRecord(sessionState);
+              sessionRecord = SessionRecord.fromSingleSessionState(serialized);
             } else if (versionMarker >= ARCHIVE_STATES_VERSION) {
               Log.i(TAG, "Migrating session: " + sessionFile.getAbsolutePath());
               sessionRecord = new SessionRecord(serialized);
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index ad4384ae0..e56dc2aec 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -456,11 +456,11 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-android:0.1.5',
-         'a95f4d8125a22552da99b5db15589454789eee322e84d9ba613c258150366a64'],
+        ['org.whispersystems:signal-client-android:0.2.2',
+         'c4b667d89be14b26cdae5b11cd363c0b6facbbdbab3a5ea08a058a92bdcba14e'],
 
-        ['org.whispersystems:signal-client-java:0.1.5',
-         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
+        ['org.whispersystems:signal-client-java:0.2.2',
+         'fa5486e860ed0463d17fd14e0a1131d56e8d5d3c22e02400dfcd995fc7145a67'],
 
         ['pl.tajchert:waitingdots:0.1.0',
          '2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c'],
diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
index ba32e5fcc..a2d7d1bcb 100644
--- a/libsignal/service/build.gradle
+++ b/libsignal/service/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     api 'com.googlecode.libphonenumber:libphonenumber:8.12.16'
     api 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
 
-    api 'org.whispersystems:signal-client-java:0.1.5'
+    api 'org.whispersystems:signal-client-java:0.2.2'
     api 'com.squareup.okhttp3:okhttp:3.12.10'
     implementation 'org.threeten:threetenbp:1.3.6'
 
diff --git a/libsignal/service/witness-verifications.gradle b/libsignal/service/witness-verifications.gradle
index 1b8f84a7c..9582f9856 100644
--- a/libsignal/service/witness-verifications.gradle
+++ b/libsignal/service/witness-verifications.gradle
@@ -30,7 +30,7 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-java:0.1.5',
-         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
+        ['org.whispersystems:signal-client-java:0.2.2',
+         'fa5486e860ed0463d17fd14e0a1131d56e8d5d3c22e02400dfcd995fc7145a67'],
     ]
 }