diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index e86c6b3e2e..4d5997d6e9 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004  - 2019, Intel Corporation. All rights reserved.<BR>
                                                                                    
   SPDX-License-Identifier: BSD-2-Clause-Patent
                                                                                    
@@ -1702,6 +1702,8 @@ PlatformBdsPolicyBehavior (
     EsrtManagement = NULL;
   }
 
+  DEBUG ((DEBUG_INFO, "BDS: BootMode=%02x\n", BootMode));
+
   switch (BootMode) {
 
   case BOOT_WITH_MINIMAL_CONFIGURATION:
@@ -1778,9 +1780,8 @@ PlatformBdsPolicyBehavior (
       goto FULL_CONFIGURATION;
     }
 
-    if (SystemConfiguration.QuietBoot) {
-      EnableQuietBoot (PcdGetPtr(PcdLogoFile));
-    } else {
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
+    if (!SystemConfiguration.QuietBoot) {
       PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
     }
 
@@ -1864,8 +1865,7 @@ PlatformBdsPolicyBehavior (
     // Boot with the specific configuration
     //
     PlatformBdsConnectConsole (gPlatformConsole);
-    PlatformBdsDiagnostics (EXTENSIVE, FALSE, BaseMemoryTest);
-    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
+    PlatformBdsDiagnostics (EXTENSIVE, TRUE, BaseMemoryTest);
 
     DEBUG((DEBUG_INFO, "ProcessCapsules Before EndOfDxe......\n"));
     ProcessCapsules ();
@@ -1968,10 +1968,9 @@ FULL_CONFIGURATION:
     // Perform some platform specific connect sequence
     //
     PlatformBdsConnectSequence ();
-    if (SystemConfiguration.QuietBoot) {
-        EnableQuietBoot (PcdGetPtr(PcdLogoFile));
-    } else {
-        PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
+    if (!SystemConfiguration.QuietBoot) {
+      PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
     }
 
     //