diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index ebf4c21eaf6..168eba07843 100644
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/mesa/pipe/xlib/xm_api.c
@@ -447,6 +447,10 @@ xmesa_free_buffer(XMesaBuffer buffer)
          /* Unreference.  If count = zero we'll really delete the buffer */
          _mesa_unreference_framebuffer(&fb);
 
+         XFreeGC(b->xm_visual->display, b->gc);
+
+         free(buffer);
+
          return;
       }
       /* continue search */