diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
index 21513752de..63bdf92f55 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
@@ -1,7 +1,7 @@
 /** @file
  		Implementation of initializing a network adapter.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed 
 and made available under the terms and conditions of the BSD License which 
 accompanies this distribution. The full text of the license may be found at 
@@ -37,6 +37,8 @@ PxeInit (
   VOID                *Addr;
   EFI_STATUS          Status;
 
+  Status = EFI_SUCCESS;
+
   Cpb = Snp->Cpb;
   if (Snp->TxRxBufferSize != 0) {
     Status = Snp->PciIo->AllocateBuffer (
@@ -99,10 +101,30 @@ PxeInit (
 
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
 
-  if (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS) {
-    Snp->Mode.State = EfiSimpleNetworkInitialized;
-
-    Status          = EFI_SUCCESS;
+  //
+  // There are two fields need to be checked here:
+  // First is the upper two bits (14 & 15) in the CDB.StatFlags field. Until these bits change to report 
+  // PXE_STATFLAGS_COMMAND_COMPLETE or PXE_STATFLAGS_COMMAND_FAILED, the command has not been executed by the UNDI.
+  // Second is the CDB.StatCode field. After command execution completes, either successfully or not, 
+  // the CDB.StatCode field contains the result of the command execution.
+  //
+  if ((((Snp->Cdb.StatFlags) & PXE_STATFLAGS_STATUS_MASK) == PXE_STATFLAGS_COMMAND_COMPLETE) &&
+      (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS)) {
+    //
+    // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an 
+    // active connection to this network device. If the no media StatFlag is set, the UNDI and network 
+    // device are still initialized.    
+    //
+    if (CableDetectFlag == PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) {
+      if(((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {
+        Snp->Mode.MediaPresent = TRUE;
+      } else {
+        Snp->Mode.MediaPresent = FALSE;
+      }
+    }
+    
+    Snp->Mode.State   = EfiSimpleNetworkInitialized;
+    Status            = EFI_SUCCESS;
   } else {
     DEBUG (
       (EFI_D_WARN,
@@ -234,7 +256,6 @@ SnpUndi32Initialize (
   //
   if (Snp->CableDetectSupported) {
     if (PxeInit (Snp, PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) == EFI_SUCCESS) {
-      Snp->Mode.MediaPresent = TRUE;
       goto ON_EXIT;
     }
   }