diff --git a/src/Signal/libsignal.ts b/src/Signal/libsignal.ts
index 2755086b..0aef6d22 100644
--- a/src/Signal/libsignal.ts
+++ b/src/Signal/libsignal.ts
@@ -255,9 +255,9 @@ export function makeLibSignalRepository(
 		metrics.signalIdentityKeyCacheSize?.set(identityKeyCache.size)
 	}, 60000) // Every minute
 
-	// Cleanup interval on process exit
-	if (typeof process !== 'undefined') {
-		process.on('beforeExit', () => clearInterval(cacheMetricsInterval))
+	// Allow process to exit even with interval active (prevents blocking in short-lived scripts/tests)
+	if (typeof cacheMetricsInterval.unref === 'function') {
+		cacheMetricsInterval.unref()
 	}
 
 	const storage = signalStorage(auth, lidMapping, identityKeyCache, ev, preKeyCircuitBreaker, logger)
@@ -334,7 +334,8 @@ export function makeLibSignalRepository(
 								)
 
 								// Reset prekey circuit breaker since we identified the cause
-								if (preKeyCircuitBreaker?.isOpen()) {
+								// Reset regardless of state (could be open, half-open, or closed with accumulated failures)
+								if (preKeyCircuitBreaker) {
 									preKeyCircuitBreaker.reset()
 									logger.debug({ jid }, 'Reset prekey circuit breaker after identity key change detection')
 								}
diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index c0b30181..ccb66a53 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -452,12 +452,18 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 				// Check if we have a session with this JID
 				const sessionId = signalRepository.jidToSignalProtocolAddress(fromJid)
 				const hasSession = await signalRepository.validateSession(fromJid)
-				const result = messageRetryManager.shouldRecreateSession(fromJid, hasSession.exists)
+
+				// Extract error code from retry node if present (for MAC error detection)
+				const retryNode = getBinaryNodeChild(node, 'retry')
+				const errorAttr = retryNode?.attrs?.error as string | undefined
+				const errorCode = messageRetryManager.parseRetryErrorCode(errorAttr)
+
+				const result = messageRetryManager.shouldRecreateSession(fromJid, hasSession.exists, errorCode)
 				shouldRecreateSession = result.recreate
 				recreateReason = result.reason
 
 				if (shouldRecreateSession) {
-					logger.debug({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry')
+					logger.debug({ fromJid, retryCount, reason: recreateReason, errorCode }, 'recreating session for retry')
 					// Delete existing session to force recreation
 					await authState.keys.set({ session: { [sessionId]: null } })
 					forceIncludeKeys = true
@@ -1006,12 +1012,17 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 				const sessionId = signalRepository.jidToSignalProtocolAddress(participant)
 
 				const hasSession = await signalRepository.validateSession(participant)
-				const result = messageRetryManager.shouldRecreateSession(participant, hasSession.exists)
+
+				// Extract error code from retry node if present (for MAC error detection)
+				const errorAttr = retryNode?.attrs?.error as string | undefined
+				const errorCode = messageRetryManager.parseRetryErrorCode(errorAttr)
+
+				const result = messageRetryManager.shouldRecreateSession(participant, hasSession.exists, errorCode)
 				shouldRecreateSession = result.recreate
 				recreateReason = result.reason
 
 				if (shouldRecreateSession) {
-					logger.debug({ participant, retryCount, reason: recreateReason }, 'recreating session for outgoing retry')
+					logger.debug({ participant, retryCount, reason: recreateReason, errorCode }, 'recreating session for outgoing retry')
 					await authState.keys.set({ session: { [sessionId]: null } })
 				}
 			} catch (error) {