diff --git a/main/tasks/sub_pub_unsub/sub_pub_unsub.c b/main/tasks/sub_pub_unsub/sub_pub_unsub.c
index 64e3b6c..71a915e 100644
--- a/main/tasks/sub_pub_unsub/sub_pub_unsub.c
+++ b/main/tasks/sub_pub_unsub/sub_pub_unsub.c
@@ -536,28 +536,11 @@ static void prvPublishToTopic(MQTTQoS_t xQoS,
         /* Check all ways the status was passed back just for demonstration
          * purposes. */
         if ((xCommandAcknowledged != pdTRUE) ||
-            (xCommandContext.xReturnStatus != MQTTSuccess) ||
-            (ulNotifiedValue != ulPublishMessageId))
+            (xCommandContext.xReturnStatus != MQTTSuccess))
         {
             ESP_LOGW(TAG,
-                     "Error or timed out waiting for ack for publish message %" PRIu32 ".",
+                     "Error or timed out waiting for ack for publish message %" PRIu32 ". Re-attempting publish.",
                      ulPublishMessageId);
-
-            /* Generate a new publish ID so that we can differentiate late
-             * acknowledgements. */
-            xSemaphoreTake(xMessageIdSemaphore, portMAX_DELAY);
-            {
-                ++ulMessageId;
-                ulPublishMessageId = ulMessageId;
-            }
-            xSemaphoreGive(xMessageIdSemaphore);
-
-            ESP_LOGW(TAG,
-                     "Re-attempting publish with new ID %" PRIu32 ".",
-                     ulPublishMessageId);
-
-            /* Update publish ID in the command context. */
-            xCommandContext.ulNotificationValue = ulPublishMessageId;
         }
         else
         {
@@ -567,8 +550,7 @@ static void prvPublishToTopic(MQTTQoS_t xQoS,
                      pcTaskGetName(xCommandContext.xTaskToNotify));
         }
     } while ((xCommandAcknowledged != pdTRUE) ||
-             (xCommandContext.xReturnStatus != MQTTSuccess) ||
-             (ulNotifiedValue != ulPublishMessageId));
+             (xCommandContext.xReturnStatus != MQTTSuccess));
 }
 
 static void prvSubscribeToTopic(IncomingPublishCallbackContext_t *pxIncomingPublishCallbackContext,