diff --git a/radio/COMMON/common_lib.c b/radio/COMMON/common_lib.c
index 4720347f20..5e12d11e2b 100644
--- a/radio/COMMON/common_lib.c
+++ b/radio/COMMON/common_lib.c
@@ -217,7 +217,7 @@ static void writerProcessWaitingQueue(nrue_ru_write_t nrue_ru_write, PHY_VARS_NR
           else
             wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags);
           if (wroteSamples != nsamps)
-            LOG_E(HW, "Failed to write to rf\n");
+            LOG_W(HW, "Failed to write to RF: wrote %d out of %d samples\n", wroteSamples, nsamps);
         }
         ctx->nextTS = timestamp + nsamps;
         pthread_mutex_lock(&ctx->mutex_store);
@@ -258,6 +258,8 @@ int openair0_write_reorder_common(nrue_ru_write_t nrue_ru_write,
           wroteSamples = nrue_ru_write(UE, timestamp, txp, nsamps, nbAnt, flags);
         else
           wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags);
+        if (wroteSamples != nsamps)
+          LOG_W(HW, "Failed to write to RF: wrote %d out of %d samples\n", wroteSamples, nsamps);
       } else
         wroteSamples = nsamps;
       ctx->nextTS = timestamp + nsamps;
diff --git a/radio/USRP/usrp_lib.cpp b/radio/USRP/usrp_lib.cpp
index f224b75354..7cd0f47ee0 100644
--- a/radio/USRP/usrp_lib.cpp
+++ b/radio/USRP/usrp_lib.cpp
@@ -553,7 +553,7 @@ static int trx_usrp_write(openair0_device_t *device,
       LOG_D(HW, "Signaling TX TS %llu\n", (unsigned long long)timestamp);
       pthread_cond_signal(&write_thread->cond_write);
       pthread_mutex_unlock(&write_thread->mutex_write);
-      return 0;
+      return nsamps;
     }
 }