diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index 38fb6ade42..8443f34e04 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -282,6 +282,7 @@ TcpTrimSegment (
 
     Seg->Seq = Seg->End;
     NetbufTrim (Nbuf, Nbuf->TotalSize, NET_BUF_HEAD);
+    return;
   }
 
   //
@@ -1266,6 +1267,9 @@ NO_UPDATE:
       TcpClose (Tcb);
     }
     break;
+
+  default:
+    break;
   }
 
   //
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 9fa9e8315a..1b0ae5ec54 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -839,6 +839,9 @@ TcpOnAppConsume (
   case TCP_LAST_ACK:
   case TCP_TIME_WAIT:
     return;
+
+  default:
+    break;
   }
 }
 
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 945a5cac22..616e9e23eb 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -549,15 +549,13 @@ TcpTickingDpc (
         //
         if ((Next->BackLink != Entry) ||
             (Tcb->EnabledTimer == 0)) {
-
-          goto NextConnection;
+          break;
         }
       }
     }
-
-    TcpUpdateTimer (Tcb);
-NextConnection:
-    ;
+    if (Index == TCP_TIMER_NUMBER) {
+      TcpUpdateTimer (Tcb);
+    }
   }
 }