diff --git a/utils/hwstub/lib/hwstub_net.cpp b/utils/hwstub/lib/hwstub_net.cpp
index 89994cdf7a..6f828f81ec 100644
--- a/utils/hwstub/lib/hwstub_net.cpp
+++ b/utils/hwstub/lib/hwstub_net.cpp
@@ -391,7 +391,7 @@ error context::send_cmd(uint32_t cmd, uint32_t args[HWSTUB_NET_ARGS], uint8_t *s
         }
     }
     /* copy data if user want it */
-    if(recv_data)
+    if(recv_data && recv_size)
     {
         if(*recv_data == nullptr)
         {
@@ -1221,7 +1221,6 @@ error server::handle_cmd(client_state *state, uint32_t cmd, uint32_t args[HWSTUB
         error err = it->second->write(addr, recv_data, recv_size, !!(flags & HWSERVER_RW_ATOMIC));
         if(err != error::SUCCESS)
         {
-            delete[] send_data;
             debug() << "[net::srv::cmd] cannot write: " << error_string(err) << "\n";
             debug() << "[net::srv::cmd] <-- WRITE (error)\n";
             return err;