diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 40e89a9170..05edbd0fec 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
@@ -378,9 +378,7 @@ GraphicsConsoleControllerDriverStart (
                          );
       if (!EFI_ERROR (Status)) {
         if ((Info->HorizontalResolution == 800) &&
-            (Info->VerticalResolution == 600) &&
-            ((Info->PixelFormat == PixelRedGreenBlueReserved8BitPerColor) ||
-             (Info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor))) {
+            (Info->VerticalResolution == 600)) {
           Status = Private->GraphicsOutput->SetMode (Private->GraphicsOutput, ModeNumber);
           if (!EFI_ERROR (Status)) {
             gBS->FreePool (Info);
@@ -1164,6 +1162,10 @@ GraphicsConsoleConOutSetMode (
   UgaDraw   = Private->UgaDraw;
   ModeData  = &(Private->ModeData[ModeNumber]);
 
+  if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {
+    return EFI_UNSUPPORTED;
+  }
+
   //
   // Make sure the requested mode number is supported
   //