diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
index 47af4fee40..1e0b00b3f7 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
@@ -650,6 +650,7 @@ DriverCallback (
 
       EndOpCodeHandle = HiiAllocateOpCodeHandle ();
       if (EndOpCodeHandle == NULL) {
+        HiiFreeOpCodeHandle (StartOpCodeHandle);
         return EFI_OUT_OF_RESOURCES;
       }