diff --git a/QcomModulePkg/Library/BootLib/PartitionTableUpdate.c b/QcomModulePkg/Library/BootLib/PartitionTableUpdate.c
index fd5a837..9d37e94 100755
--- a/QcomModulePkg/Library/BootLib/PartitionTableUpdate.c
+++ b/QcomModulePkg/Library/BootLib/PartitionTableUpdate.c
@@ -28,6 +28,7 @@
  */
 #include "PartitionTableUpdate.h"
 #include "AutoGen.h"
+#include <DeviceInfo.h>
 #include <Library/Board.h>
 #include <Library/BootLinux.h>
 #include <Library/LinuxLoaderLib.h>
@@ -1632,7 +1633,10 @@
       (BootEntry->PartEntry.Attributes & PART_ATT_MAX_RETRY_COUNT_VAL) >>
       PART_ATT_MAX_RETRY_CNT_BIT;
 
-  if (Unbootable == 0 && BootSuccess == 1) {
+  if (IsMainlineSupportEnabled ()) {
+    DEBUG ((EFI_D_VERBOSE, "Mainline support is enabled, not checking, "
+                           "if slot %s is bootable\n", BootableSlot->Suffix));
+  } else if (Unbootable == 0 && BootSuccess == 1) {
     DEBUG (
         (EFI_D_VERBOSE, "Active Slot %s is bootable\n", BootableSlot->Suffix));
   } else if (Unbootable == 0 && BootSuccess == 0 && RetryCount > 0) {