1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc
index bc88a752..ea6519e2 100644
--- a/src/buffer_manager.cc
+++ b/src/buffer_manager.cc
@@ -57,11 +57,11 @@ void BufferManager::delete_buffer(Buffer& buffer)
                       { return p.get() == &buffer; });
     kak_assert(it != m_buffers.end());
 
-    ClientManager::instance().ensure_no_client_uses_buffer(buffer);
-
     m_buffer_trash.emplace_back(std::move(*it));
     m_buffers.erase(it);
 
+    ClientManager::instance().ensure_no_client_uses_buffer(buffer);
+
     buffer.on_unregistered();
 }