diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
index 1e5b01e4adab5..70c10b548b4ce 100644
--- a/provisioner/echo/serve.go
+++ b/provisioner/echo/serve.go
@@ -82,6 +82,10 @@ func (e *echo) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
 		return err
 	}
 	request := msg.GetStart()
+	if request == nil {
+		// A cancel could occur here!
+		return nil
+	}
 	for index := 0; ; index++ {
 		extension := ".protobuf"
 		if request.DryRun {