diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index f99cda173bb..4afaa09b3f1 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -189,7 +189,7 @@ GHOST_WindowX11(
 	attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1;
 	attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1;
 	/* GLX 1.4+, multi-sample */
-	if((glxVersionMajor >= 1) && (glxVersionMinor >= 4)) {
+	if(m_numOfAASamples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4)) {
 		attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] = 1;
 		attributes[i++] = GLX_SAMPLES; attributes[i++] = m_numOfAASamples;
 	}