1 files changed, 6 insertions, 0 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index f428f01f1..c6947ba26 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -238,6 +238,12 @@ public:
                 return 0;
         }
 
+        // Just return if no samples requested
+        if (nsamps_per_buff == 0) {
+            metadata.reset();
+            return 0;
+        }
+
         size_t accum_num_samps =
             recv_one_packet(buffs, nsamps_per_buff, metadata, timeout);