diff --git a/cmd/drone-agent/agent.go b/cmd/drone-agent/agent.go
index c1f121912..94f9cb131 100644
--- a/cmd/drone-agent/agent.go
+++ b/cmd/drone-agent/agent.go
@@ -34,7 +34,7 @@ func loop(c *cli.Context) error {
 		Labels: map[string]string{
 			"platform": c.String("platform"),
 		},
-		Expr: c.String("drone-filter"),
+		Expr: c.String("filter"),
 	}
 
 	hostname := c.String("hostname")
diff --git a/server/rpc.go b/server/rpc.go
index 36d961566..d099ff4bc 100644
--- a/server/rpc.go
+++ b/server/rpc.go
@@ -527,6 +527,7 @@ func (s *DroneServer) Next(c oldcontext.Context, req *proto.NextRequest) (*proto
 	}
 	filter := rpc.Filter{
 		Labels: req.GetFilter().GetLabels(),
+		Expr:   req.GetFilter().GetExpr(),
 	}
 
 	res := new(proto.NextReply)