diff --git a/src/buffer.cc b/src/buffer.cc
index 757405be..2fb1a46c 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -67,6 +67,7 @@ Buffer::~Buffer()
 
     m_options.unregister_watcher(*this);
     BufferManager::instance().unregister_buffer(*this);
+    m_values.clear();
     kak_assert(m_change_listeners.empty());
 }