diff --git a/server/rpc.go b/server/rpc.go
index ce95e9683755dc2e460d1803fecc6a5676557456..45f84f0566b801745af8873b2ae9b4ab29954e3a 100644
--- a/server/rpc.go
+++ b/server/rpc.go
@@ -53,8 +53,8 @@ func authInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServe
 		if !authprovider.Valid(token) {
 			return nil, grpc.Errorf(codes.PermissionDenied, "access denied")
 		}
-		authprovider.Revoke(token)
 		ctx = context.WithValue(ctx, usernameKey, authprovider.Username(token))
+		authprovider.Revoke(token)
 	default:
 		return nil, grpc.Errorf(codes.InvalidArgument, "unknown argument")
 	}