diff --git a/StdLib/EfiSocketLib/Tcp4.c b/StdLib/EfiSocketLib/Tcp4.c
index e7924fa429..145186bb36 100644
--- a/StdLib/EfiSocketLib/Tcp4.c
+++ b/StdLib/EfiSocketLib/Tcp4.c
@@ -790,6 +790,8 @@ EslTcp4Listen (
     //  Mark the socket as configured
     //
     pSocket->bConfigured = TRUE;
+    Status = EFI_SUCCESS;
+    pSocket->errno = 0;
 
     //
     //  All done
diff --git a/StdLib/EfiSocketLib/Tcp6.c b/StdLib/EfiSocketLib/Tcp6.c
index 688a256f64..df70a94f4c 100644
--- a/StdLib/EfiSocketLib/Tcp6.c
+++ b/StdLib/EfiSocketLib/Tcp6.c
@@ -821,6 +821,8 @@ EslTcp6Listen (
     //  Mark the socket as configured
     //
     pSocket->bConfigured = TRUE;
+    Status = EFI_SUCCESS;
+    pSocket->errno = 0;
 
     //
     //  All done