diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index ff4b0c209a..11d1c764a8 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -618,12 +618,10 @@ GraphicsConsoleControllerDriverStop (
     //
     // Remove the font pack
     //
-#if 1
-    HiiLibRemovePackages (Private->HiiHandle);
-    mFirstAccessFlag = TRUE;
-#else    
-    mHii->RemovePack (mHii, Private->HiiHandle);
-#endif
+    if (Private->HiiHandle != NULL) {
+      HiiLibRemovePackages (Private->HiiHandle);
+      mFirstAccessFlag = TRUE;
+    }
 
     //
     // Free our instance data