diff --git a/src/api/customprotocol-core/oneshot.ts b/src/api/customprotocol-core/oneshot.ts
index 2d031cdf7..7a02d4ebb 100644
--- a/src/api/customprotocol-core/oneshot.ts
+++ b/src/api/customprotocol-core/oneshot.ts
@@ -25,7 +25,7 @@ export class Oneshot<H extends HandlerTypes = {}> extends Stream<H> {
             // NOTE: IsNotReady set to true means that this is simple Poll request
             if (!isFirst) msg.setIsNotReady(true);
 
-            return this.messageBuilder(msg);
+            return this.messageBuilder(msg, isFirst);
           },
           req => {
             this.pendingRequests.add(req);