diff --git a/src/infuse_iot/rpc_client.py b/src/infuse_iot/rpc_client.py
index ed7e2d4..6a7c3fe 100644
--- a/src/infuse_iot/rpc_client.py
+++ b/src/infuse_iot/rpc_client.py
@@ -136,7 +136,9 @@ def run_data_send_cmd(
 
             # Wait for ACKs at the period
             if ack_cnt == ack_period:
-                self._wait_data_ack()
+                recv = self._wait_data_ack()
+                if recv.ptype == InfuseType.RPC_RSP:
+                    return self._finalise_command(recv, rsp_decoder)
                 ack_cnt = 0
 
             offset += size