diff --git a/host/hackrf-tools/src/hackrf_transfer.c b/host/hackrf-tools/src/hackrf_transfer.c
index 8148153f..1699a15b 100644
--- a/host/hackrf-tools/src/hackrf_transfer.c
+++ b/host/hackrf-tools/src/hackrf_transfer.c
@@ -507,16 +507,11 @@ int tx_callback(hackrf_transfer* transfer)
 		/* Transmit continuous wave with specific amplitude */
 		for (i = 0; i < bytes_to_read; i++)
 			transfer->buffer[i] = -(uint8_t) amplitude;
-
-		if (limit_num_samples && (bytes_to_xfer == 0)) {
-			stop_main_loop();
-			return -1;
-		} else {
-			return 0;
-		}
+		bytes_read = bytes_to_read;
+	} else {
+		bytes_read = fread(transfer->buffer, 1, bytes_to_read, file);
 	}
 
-	bytes_read = fread(transfer->buffer, 1, bytes_to_read, file);
 	if (limit_num_samples && (bytes_to_xfer == 0)) {
 		stop_main_loop();
 		return -1;