diff --git a/examples/host/cdc_msc_hid/src/cdc_app.c b/examples/host/cdc_msc_hid/src/cdc_app.c
index 123cb33f0..db652efde 100644
--- a/examples/host/cdc_msc_hid/src/cdc_app.c
+++ b/examples/host/cdc_msc_hid/src/cdc_app.c
@@ -52,26 +52,31 @@ size_t get_console_inputs(uint8_t* buf, size_t bufsize)
 void cdc_app_task(void)
 {
   uint8_t buf[64+1]; // +1 for extra null character
-  memset(buf, 0, sizeof(buf));
+  uint32_t const bufsize = sizeof(buf)-1;
 
-  size_t count = get_console_inputs(buf, sizeof(buf)-1);
+  uint32_t console_count = get_console_inputs(buf, bufsize);
+  buf[console_count] = 0;
 
   // loop over all mounted interfaces
-  for(size_t idx=0; idx<CFG_TUH_CDC; idx++)
+  for(uint8_t idx=0; idx<CFG_TUH_CDC; idx++)
   {
     if ( tuh_cdc_mounted(idx) )
     {
       // console --> cdc interfaces
-      if (count)
+      if (console_count)
       {
-        tuh_cdc_write(idx, buf, count);
+        tuh_cdc_write(idx, buf, console_count);
         tuh_cdc_write_flush(idx);
       }
 
       // cdc interfaces -> console
       if ( tuh_cdc_read_available(idx) )
       {
-        printf((char*) buf);
+        uint8_t buf_cdc[64+1];
+        uint32_t cdc_count = tuh_cdc_read(idx, buf_cdc, sizeof(buf_cdc)-1);
+        buf_cdc[cdc_count] = 0;
+
+        printf((char*) buf_cdc);
       }
     }
   }
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index f8d996e17..326567689 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -459,7 +459,8 @@ bool cdch_xfer_cb(uint8_t daddr, uint8_t ep_addr, xfer_result_t event, uint32_t
   }
   else if ( ep_addr == p_cdc->stream.rx.ep_addr )
   {
-    tu_edpt_stream_read_xfer_complete(&p_cdc->stream.rx, xferred_bytes);
+    // skip if ZLP
+    if (xferred_bytes) tu_edpt_stream_read_xfer_complete(&p_cdc->stream.rx, xferred_bytes);
 
     // invoke receive callback