diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dbf9b4dc..75496555 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.32"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_141"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_142"
 sqlite = "org.xerial:sqlite-jdbc:3.51.2.0"
 hikari = "com.zaxxer:HikariCP:7.0.2"
 junit-jupiter-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 96a94128..af2f85be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -60,7 +60,7 @@ public class SendRetryMessageRequestAction implements HandleAction {
             return CiphertextMessage.WHISPER_TYPE;
         }
         return switch (type) {
-            case PREKEY_BUNDLE -> CiphertextMessage.PREKEY_TYPE;
+            case PREKEY_MESSAGE -> CiphertextMessage.PREKEY_TYPE;
             case UNIDENTIFIED_SENDER -> CiphertextMessage.SENDERKEY_TYPE;
             case PLAINTEXT_CONTENT -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
             default -> CiphertextMessage.WHISPER_TYPE;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 2240ca76..92014fa3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -661,10 +661,6 @@ public final class IncomingMessageHandler {
                 final var aep = keysMessage.getAccountEntropyPool();
                 account.setAccountEntropyPool(aep);
                 actions.add(SyncStorageDataAction.create());
-            } else if (keysMessage.getMaster() != null) {
-                final var masterKey = keysMessage.getMaster();
-                account.setMasterKey(masterKey);
-                actions.add(SyncStorageDataAction.create());
             } else if (keysMessage.getStorageService() != null) {
                 final var storageKey = keysMessage.getStorageService();
                 account.setStorageKey(storageKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index a13fc38f..332f8ae7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -258,7 +258,6 @@ public class SyncHelper {
 
     public SendMessageResult sendKeysMessage() {
         var keysMessage = new KeysMessage(account.getOrCreateStorageKey(),
-                account.getOrCreatePinMasterKey(),
                 account.getOrCreateAccountEntropyPool(),
                 account.getOrCreateMediaRootBackupKey());
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index eeca842a..b90e08c3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -145,7 +145,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
                     profileKey,
-                    ret.getMasterKey(),
                     ret.getAccountEntropyPool(),
                     ret.getMediaRootBackupKey());
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4116132a..3e02aed0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -292,7 +292,6 @@ public class SignalAccount implements Closeable {
             final IdentityKeyPair aciIdentity,
             final IdentityKeyPair pniIdentity,
             final ProfileKey profileKey,
-            final MasterKey masterKey,
             final AccountEntropyPool accountEntropyPool,
             final MediaRootBackupKey mediaRootBackupKey
     ) {
@@ -314,7 +313,7 @@ public class SignalAccount implements Closeable {
             this.pinMasterKey = null;
             this.accountEntropyPool = accountEntropyPool;
         } else {
-            this.pinMasterKey = masterKey;
+            this.pinMasterKey = null;
             this.accountEntropyPool = null;
         }
         this.mediaRootBackupKey = mediaRootBackupKey;