diff --git a/lib/roles/mqtt/mqtt.c b/lib/roles/mqtt/mqtt.c
index e92fc0d10..191c7458e 100644
--- a/lib/roles/mqtt/mqtt.c
+++ b/lib/roles/mqtt/mqtt.c
@@ -2217,6 +2217,8 @@ lws_mqtt_client_send_subcribe(struct lws *wsi, lws_mqtt_subscribe_param_t *sub)
 			   (int)sub->packet_id);
 		lws_ser_wu16be(p, wsi->mqtt->ack_pkt_id);
 
+		nwsi->mqtt->client.aws_iot = wsi->mqtt->client.aws_iot;
+
 		if (lws_mqtt_str_advance(&mqtt_vh_payload, 2))
 			return 1;
 
@@ -2385,6 +2387,8 @@ lws_mqtt_client_send_unsubcribe(struct lws *wsi,
 			   (int)wsi->mqtt->ack_pkt_id);
 		lws_ser_wu16be(p, wsi->mqtt->ack_pkt_id);
 
+		nwsi->mqtt->client.aws_iot = wsi->mqtt->client.aws_iot;
+
 		if (lws_mqtt_str_advance(&mqtt_vh_payload, 2))
 			return 1;