diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c
index 5416a009dcb..3859050bf18 100644
--- a/src/gallium/drivers/svga/svga_pipe_query.c
+++ b/src/gallium/drivers/svga/svga_pipe_query.c
@@ -754,7 +754,8 @@ svga_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
    struct svga_query *sq;
 
    if (q == NULL) {
-      return destroy_gb_query_obj(svga);
+      destroy_gb_query_obj(svga);
+      return;
    }
 
    sq = svga_query(q);