diff --git a/src/TopicTree.h b/src/TopicTree.h
index 463f7e7..6567008 100644
--- a/src/TopicTree.h
+++ b/src/TopicTree.h
@@ -473,6 +473,9 @@ public:
                 topic->subs.erase(subscriber);
                 trimTree(topic);
             }
+            /* If we are sender with outstanding holes, remove them now that we are dead */
+            senderHoles.erase(subscriber);
+
             subscriber->subscriptions.clear();
         }
     }