diff --git a/client.cpp b/client.cpp
index e4c84ee..03fb9bd 100644
--- a/client.cpp
+++ b/client.cpp
@@ -53,12 +53,6 @@ Client::~Client()
 {
     std::shared_ptr<SubscriptionStore> &store = getThreadData()->getSubscriptionStore();
 
-    // Will payload can be empty, apparently.
-    if (willPublish)
-    {
-        store->queueWillMessage(willPublish);
-    }
-
     if (disconnectReason.empty())
         disconnectReason = "not specified";