diff --git a/src/encoding/buffer-stream.cpp b/src/encoding/buffer-stream.cpp
index e60ba77..3fed843 100644
--- a/src/encoding/buffer-stream.cpp
+++ b/src/encoding/buffer-stream.cpp
@@ -45,6 +45,11 @@
   open(m_device);
 }
 
+OBufferStream::~OBufferStream()
+{
+  close();
+}
+
 shared_ptr<Buffer>
 OBufferStream::buf()
 {
diff --git a/src/encoding/buffer-stream.hpp b/src/encoding/buffer-stream.hpp
index b813e49..e7dc60f 100644
--- a/src/encoding/buffer-stream.hpp
+++ b/src/encoding/buffer-stream.hpp
@@ -72,6 +72,8 @@
 public:
   OBufferStream();
 
+  ~OBufferStream();
+
   /**
    * Flush written data to the stream and return shared pointer to the underlying buffer
    */