diff --git a/readme.html b/readme.html
index 413be001..e1b29330 100644
--- a/readme.html
+++ b/readme.html
@@ -341,6 +341,7 @@ version of GLFW.</p>
   <li>[Win32] Bugfix: The array for WGL context attributes was too small and could overflow</li>
   <li>[Win32] Bugfix: Alt+F4 hot key was not translated into <code>WM_CLOSE</code></li>
   <li>[Win32] Bugfix: The <code>GLFW_WINDOW_NO_RESIZE</code> window parameter was always zero</li>
+  <li>[Win32] Bugfix: A test was missing for whether all available pixel formats had been disqualified</li>
 </ul>
 
 <h3>v2.7</h3>
diff --git a/src/win32_window.c b/src/win32_window.c
index 9e535136..47862622 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -298,6 +298,12 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
         (*found)++;
     }
 
+    if (*found == 0)
+    {
+        free(fbconfigs);
+        return NULL;
+    }
+
     return fbconfigs;
 }