diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
index fe92a9855c..ad5cb3cf7b 100644
--- a/NetworkPkg/ArpDxe/ArpImpl.c
+++ b/NetworkPkg/ArpDxe/ArpImpl.c
@@ -304,12 +304,12 @@ RESTART_RECEIVE:
   //
   Status = ArpService->Mnp->Receive (ArpService->Mnp, RxToken);
 
-  DEBUG_CODE (
+  DEBUG_CODE_BEGIN ();
     if (EFI_ERROR (Status)) {
       DEBUG ((DEBUG_ERROR, "ArpOnFrameRcvd: ArpService->Mnp->Receive "
         "failed, %r\n.", Status));
     }
-  );
+  DEBUG_CODE_END ();
 }
 
 /**
@@ -358,11 +358,11 @@ ArpOnFrameSentDpc (
   TxToken = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *)Context;
   TxData  = TxToken->Packet.TxData;
 
-  DEBUG_CODE (
+  DEBUG_CODE_BEGIN ();
     if (EFI_ERROR (TxToken->Status)) {
       DEBUG ((DEBUG_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));
     }
-  );
+  DEBUG_CODE_END ();
 
   //
   // Free the allocated memory and close the event.
diff --git a/NetworkPkg/MnpDxe/MnpConfig.c b/NetworkPkg/MnpDxe/MnpConfig.c
index b27bc2e1f6..1e9b390586 100644
--- a/NetworkPkg/MnpDxe/MnpConfig.c
+++ b/NetworkPkg/MnpDxe/MnpConfig.c
@@ -1669,7 +1669,7 @@ MnpConfigReceiveFilters (
                   MCastFilterCnt,
                   MCastFilter
                   );
-  DEBUG_CODE (
+  DEBUG_CODE_BEGIN ();
     if (EFI_ERROR (Status)) {
       DEBUG (
         (DEBUG_ERROR,
@@ -1677,7 +1677,7 @@ MnpConfigReceiveFilters (
         Status)
         );
     }
-  );
+  DEBUG_CODE_END ();
 
   if (MCastFilter != NULL) {
     //
diff --git a/NetworkPkg/MnpDxe/MnpIo.c b/NetworkPkg/MnpDxe/MnpIo.c
index 1f8d2e2504..d5707ae26a 100644
--- a/NetworkPkg/MnpDxe/MnpIo.c
+++ b/NetworkPkg/MnpDxe/MnpIo.c
@@ -898,11 +898,11 @@ MnpReceivePacket (
   //
   Status = Snp->Receive (Snp, &HeaderSize, &BufLen, BufPtr, NULL, NULL, NULL);
   if (EFI_ERROR (Status)) {
-    DEBUG_CODE (
+    DEBUG_CODE_BEGIN ();
       if (Status != EFI_NOT_READY) {
         DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));
       }
-    );
+    DEBUG_CODE_END ();
 
     return Status;
   }