diff --git a/pkg/invitations/encoder/grpc.go b/pkg/invitations/encoder/grpc.go
index d74cc10d64961da4f965763fb7030bbc19e1923a..4612032e0ef1d340809ef933ab24f923150bd876 100644
--- a/pkg/invitations/encoder/grpc.go
+++ b/pkg/invitations/encoder/grpc.go
@@ -65,19 +65,19 @@ func (e *Encoder) DecodeDeleteRequest(request *pb.DeleteRequest) (invitationId s
 func (e *Encoder) EncodeFindRequest(filter *invitations.Filter, opts *options.FindOptions) *pb.FindRequest {
 	request := &pb.FindRequest{}
 
-	if request.Filter != nil {
-		filter = &invitations.Filter{
-			ID:      request.Filter.Id,
-			Email:   request.Filter.Email,
-			OrgID:   request.Filter.OrgId,
-			SpaceID: request.Filter.SpaceId,
-			OwnerID: request.Filter.OwnerId,
-			Role:    request.Filter.Role,
+	if filter != nil {
+		request.Filter = &pb.Filter{
+			Id:      filter.ID,
+			Email:   filter.Email,
+			OrgId:   filter.OrgID,
+			SpaceId: filter.SpaceID,
+			OwnerId: filter.OwnerID,
+			Role:    filter.Role,
 		}
 	}
 
-	if request.Options != nil {
-		opts = options.FindOptionsFromPB(request.Options)
+	if opts != nil {
+		request.Options = options.FindOptionsToPB(opts)
 	}
 
 	return request