diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index b0f45d9332a..a1edb52efcf 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -30,6 +30,7 @@
 #include "main/mtypes.h"
 #include "main/fbobject.h"
 #include "main/glformats.h"
+#include "main/state.h"
 
 
 /**
@@ -73,6 +74,10 @@ _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat * val)
 {
    GET_CURRENT_CONTEXT(ctx);
 
+   if (ctx->NewState & _NEW_BUFFERS) {
+      _mesa_update_state(ctx);
+   }
+
    switch (pname) {
    case GL_SAMPLE_POSITION: {
       if (index >= ctx->DrawBuffer->Visual.samples) {