diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index aa5c2dba..1340cd0a 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -699,6 +699,7 @@ public class Manager implements Signal {
             for (SignalServiceAddress address : signalServiceAddresses) {
                 handleEndSession(address);
             }
+            account.save();
             throw e;
         }
     }