diff --git a/server/queue.c b/server/queue.c
index 22f720530b9..07a31b47370 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -3362,7 +3362,7 @@ DECL_HANDLER(get_rawinput_buffer)
         free_message( msg );
 
         size += next_size;
-        pos += sizeof(*data);
+        pos += sizeof(*data) + extra_size;
         count++;
     }