diff --git a/db/src/storage.rs b/db/src/storage.rs
index 72eacab6..d3c56099 100644
--- a/db/src/storage.rs
+++ b/db/src/storage.rs
@@ -459,6 +459,12 @@ impl Storage {
 	}
 }
 
+impl Drop for Storage {
+	fn drop(&mut self) {
+		self.database.flush();
+	}
+}
+
 impl BlockHeaderProvider for Storage {
 	fn block_header_bytes(&self, block_ref: BlockRef) -> Option<Bytes> {
 		self.resolve_hash(block_ref).and_then(|h| self.get(COL_BLOCK_HEADERS, &*h))