diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
index 0f125c5448..79f899ef2a 100644
--- a/features/lorawan/LoRaWANStack.cpp
+++ b/features/lorawan/LoRaWANStack.cpp
@@ -614,6 +614,8 @@ void LoRaWANStack::post_process_tx_with_reception()
                          _loramac.get_device_class() == CLASS_A ? "A" : "C");
                 _ctrl_flags &= ~TX_DONE_FLAG;
                 _ctrl_flags |= RETRY_EXHAUSTED_FLAG;
+                _loramac.post_process_mcps_req();
+                make_tx_metadata_available();
                 state_controller(DEVICE_STATE_STATUS_CHECK);
             }
         }
diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/features/lorawan/lorastack/mac/LoRaMac.cpp
index 05c58a97cf..a971fb9cd4 100644
--- a/features/lorawan/lorastack/mac/LoRaMac.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMac.cpp
@@ -166,11 +166,12 @@ void LoRaMac::post_process_mcps_req()
             _params.is_node_ack_requested = false;
             _mcps_confirmation.ack_received = false;
             _mcps_indication.is_ack_recvd = false;
-            _params.ul_frame_counter++;
-            _params.adr_ack_counter++;
         } else {
             _mcps_confirmation.status = LORAMAC_EVENT_INFO_STATUS_ERROR;
         }
+
+        _params.ul_frame_counter++;
+        _params.adr_ack_counter++;
     } else {
         //UNCONFIRMED or PROPRIETARY
         _params.ul_frame_counter++;