diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 37f6255af0..349e5c5692 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -1918,7 +1918,7 @@ IScsiConfigUpdateAttempt (
                                                NULL
                                                );
       if (AttemptConfigData->AttemptTitleToken == 0) {
-        return;
+        goto Exit;
       }
 
       HiiCreateGotoOpCode (
@@ -1940,6 +1940,7 @@ IScsiConfigUpdateAttempt (
     EndOpCodeHandle                  // Replace data
     );
 
+Exit:
   HiiFreeOpCodeHandle (StartOpCodeHandle);
   HiiFreeOpCodeHandle (EndOpCodeHandle);
 }