diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c
index 6ac07b219d..70cd4e60bf 100644
--- a/src/engine/gnc-commodity.c
+++ b/src/engine/gnc-commodity.c
@@ -544,8 +544,14 @@ gnc_commodity_new(QofBook *book, const char * fullname,
 void
 gnc_commodity_destroy(gnc_commodity * cm)
 {
+  QofBook *book;
+  gnc_commodity_table *table;
   if(!cm) return;
 
+  book = qof_instance_get_book(&cm->inst);
+  table = gnc_commodity_table_get_table(book);
+  gnc_commodity_table_remove(table, cm);
+
   qof_event_gen (&cm->inst.entity, QOF_EVENT_DESTROY, NULL);
 
   /* Set at creation */