diff --git a/Library/OcDeviceMiscLib/ForgeUefi.c b/Library/OcDeviceMiscLib/ForgeUefi.c
index 4f63408d..00d0f997 100644
--- a/Library/OcDeviceMiscLib/ForgeUefi.c
+++ b/Library/OcDeviceMiscLib/ForgeUefi.c
@@ -106,6 +106,7 @@ OcForgeUefiSupport (
   NewBS->Hdr.Revision = EFI_2_30_SYSTEM_TABLE_REVISION;
   NewBS->Hdr.CRC32 = 0;
   NewBS->Hdr.CRC32 = CalculateCrc32 (NewBS, NewBS->Hdr.HeaderSize);
+  gBS = NewBS;
 
   gST->BootServices = NewBS;
   gST->Hdr.Revision = EFI_2_30_SYSTEM_TABLE_REVISION;