diff --git a/tools/iface/src/db/rocksdb.rs b/tools/iface/src/db/rocksdb.rs
index cbfa506..e90823b 100644
--- a/tools/iface/src/db/rocksdb.rs
+++ b/tools/iface/src/db/rocksdb.rs
@@ -66,6 +66,13 @@ impl Database for RocksDB {
     }
 }
 
+impl Drop for RocksDB {
+    #[allow(unused_must_use)]
+    fn drop(&mut self) {
+        self.rocks.flush();
+    }
+}
+
 pub struct RocksDBCF<'a> {
     db: &'a mut RocksDB,
     name: String,
@@ -87,8 +94,6 @@ impl<'r> Segment for RocksDBCF<'r> {
             self.db.rocks.put_cf(cf, key, value)?;
         }
 
-        self.db.rocks.flush_cf(cf)?;
-
         Ok(())
     }