diff --git a/Source/mapping_editors/KeyboardClickListener.cpp b/Source/mapping_editors/KeyboardClickListener.cpp
index c464cfa..b3ed8ed 100644
--- a/Source/mapping_editors/KeyboardClickListener.cpp
+++ b/Source/mapping_editors/KeyboardClickListener.cpp
@@ -13,6 +13,7 @@ KeyboardClickListener::KeyboardClickListener(const LumatoneEditorState &stateIn,
 
 KeyboardClickListener::~KeyboardClickListener()
 {
+    removeColourSelectionBroadcaster(this);
     keyboardComponent->removeListener(this);
 }