diff --git a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
index 89d52d33..3ea5f564 100644
--- a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
+++ b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
@@ -45,6 +45,10 @@ public final class BlobStorage {
 
     private static Path dataDirectory; // Directory blobs get saved to.
 
+    static {
+        Runtime.getRuntime().addShutdownHook(new Thread(BlobStorage::synchronize));
+    }
+
     ///////////////////////////////////////////////////////////////////
 
     /**