diff --git a/src/add-ons/accelerants/vesa/mode.cpp b/src/add-ons/accelerants/vesa/mode.cpp
index c269d2f1f8..68cc6dab6b 100644
--- a/src/add-ons/accelerants/vesa/mode.cpp
+++ b/src/add-ons/accelerants/vesa/mode.cpp
@@ -76,17 +76,20 @@ create_mode_list(void)
 	const color_space kVesaSpaces[] = {B_RGB32_LITTLE, B_RGB24_LITTLE,
 		B_RGB16_LITTLE, B_RGB15_LITTLE, B_CMAP8};
 
-	// Create the initial list from the support mode list
-	// TODO: filter by monitor timing constraints!
-	display_mode* initialModes = (display_mode*)malloc(
-		sizeof(display_mode) * gInfo->shared_info->vesa_mode_count);
-	if (initialModes != NULL) {
-		vesa_mode* vesaModes = gInfo->vesa_modes;
+	// Create the initial list from the support mode list - but only if we don't
+	// have EDID info available, as that should be good enough.
+	display_mode* initialModes = NULL;
+	if (!gInfo->shared_info->has_edid) {
+		initialModes = (display_mode*)malloc(
+			sizeof(display_mode) * gInfo->shared_info->vesa_mode_count);
+		if (initialModes != NULL) {
+			vesa_mode* vesaModes = gInfo->vesa_modes;
 
-		for (uint32 i = gInfo->shared_info->vesa_mode_count; i-- > 0;) {
-			compute_display_timing(vesaModes[i].width, vesaModes[i].height, 60,
-				false, &initialModes[i].timing);
-			fill_display_mode(&initialModes[i]);
+			for (uint32 i = gInfo->shared_info->vesa_mode_count; i-- > 0;) {
+				compute_display_timing(vesaModes[i].width, vesaModes[i].height, 60,
+					false, &initialModes[i].timing);
+				fill_display_mode(&initialModes[i]);
+			}
 		}
 	}