diff --git a/server/encoder/ogg_encoder.cpp b/server/encoder/ogg_encoder.cpp
index e5b78744..c411479d 100644
--- a/server/encoder/ogg_encoder.cpp
+++ b/server/encoder/ogg_encoder.cpp
@@ -36,6 +36,16 @@ OggEncoder::OggEncoder(const std::string& codecOptions) : Encoder(codecOptions),
 }
 
 
+OggEncoder::~OggEncoder()
+{
+    ogg_stream_clear(&os_);
+    vorbis_block_clear(&vb_);
+    vorbis_dsp_clear(&vd_);
+    vorbis_comment_clear(&vc_);
+    vorbis_info_clear(&vi_);
+}
+
+
 std::string OggEncoder::getAvailableOptions() const
 {
     return "VBR:[-0.1 - 1.0]";
diff --git a/server/encoder/ogg_encoder.hpp b/server/encoder/ogg_encoder.hpp
index cb2f26f3..5f75e37c 100644
--- a/server/encoder/ogg_encoder.hpp
+++ b/server/encoder/ogg_encoder.hpp
@@ -29,6 +29,8 @@ class OggEncoder : public Encoder
 {
 public:
     OggEncoder(const std::string& codecOptions = "");
+    ~OggEncoder() override;
+
     void encode(const msg::PcmChunk* chunk) override;
     std::string getAvailableOptions() const override;
     std::string getDefaultOptions() const override;