diff --git a/src/xdemos/glxinfo.c b/src/xdemos/glxinfo.c
index 38bd384..6c68a12 100644
--- a/src/xdemos/glxinfo.c
+++ b/src/xdemos/glxinfo.c
@@ -1371,12 +1371,19 @@ main(int argc, char *argv[])
       numScreens = ScreenCount(dpy);
       print_display_info(dpy);
       for (scrnum = 0; scrnum < numScreens; scrnum++) {
-         mesa_hack(dpy, scrnum);
-         print_screen_info(dpy, scrnum, allowDirect, limits, singleLine);
+         int scr;
+         if (numScreens == 1) {
+            scr = DefaultScreen(dpy);
+         }
+         else {
+            scr = scrnum;
+         }
+         mesa_hack(dpy, scr);
+         print_screen_info(dpy, scr, allowDirect, limits, singleLine);
          printf("\n");
-         print_visual_info(dpy, scrnum, mode);
+         print_visual_info(dpy, scr, mode);
 #ifdef GLX_VERSION_1_3
-         print_fbconfig_info(dpy, scrnum, mode);
+         print_fbconfig_info(dpy, scr, mode);
 #endif
          if (scrnum + 1 < numScreens)
             printf("\n\n");