diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index 875f7ed5e3..d8a3f9452e 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -534,6 +534,7 @@ CreateDeviceManagerForm (
   TempSize   = 0;
   BufferSize = 0;
   Buffer     = NULL;
+  HiiHandles = NULL; // MU_CHANGE - Initialize HiiHandles to NULL
 
   HiiHandle      = gDeviceManagerPrivate.HiiHandle;
   AddNetworkMenu = FALSE;
@@ -758,7 +759,10 @@ CreateDeviceManagerForm (
     HiiFreeOpCodeHandle (StartOpCodeHandle);
   }
 
-  FreePool (HiiHandles);
+  // MU_CHANGE: Only free HiiHandles if it is not NULL
+  if (HiiHandles != NULL) {
+    FreePool (HiiHandles);
+  }
 }
 
 /**