diff --git a/src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs b/src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs
index 2f49fe9c..2559b479 100644
--- a/src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs
+++ b/src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs
@@ -692,16 +692,17 @@ public class GenericSecureTcpIpServer : Device
     /// Secure Server Socket Status Changed Callback
     /// </summary>
     /// <param name="server"></param>
-    /// <param name="args">Event arguments</param>
-    void SecureServer_SocketStatusChange(SecureTCPServer server, TCPServerWaitingForConnectionsEventArgs args)
+    /// <param name="clientIndex">Index of the client whose socket status has changed</param>
+    /// <param name="status">New socket status</param>
+    void SecureServer_SocketStatusChange(TCPServer server, uint clientIndex, SocketStatus status)
     {
         try
         {
-            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SecureServerSocketStatusChange ConnectedClients: {0} ServerState: {1} Port: {2}",
-                SecureServer.NumberOfClientsConnected, SecureServer.State, SecureServer.PortNumber);
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SecureServerSocketStatusChange ConnectedClients: {0} ServerState: {1} Port: {2} ClientIndex: {3} Status: {4}",
+                server.NumberOfClientsConnected, server.State, server.PortNumber, clientIndex, status);
 
             // Handle connection limit and listening state
-            if (SecureServer.MaxNumberOfClientSupported > SecureServer.NumberOfClientsConnected)
+            if (server.MaxNumberOfClientSupported > server.NumberOfClientsConnected)
             {
                 Listen();
             }
diff --git a/src/PepperDash.Core/Comm/GenericTcpIpServer.cs b/src/PepperDash.Core/Comm/GenericTcpIpServer.cs
index 4a7cd8a4..36b1c48d 100644
--- a/src/PepperDash.Core/Comm/GenericTcpIpServer.cs
+++ b/src/PepperDash.Core/Comm/GenericTcpIpServer.cs
@@ -671,13 +671,14 @@ public class GenericTcpIpServer : Device
     /// Secure Server Socket Status Changed Callback
     /// </summary>
     /// <param name="server"></param>
-    /// <param name="args">Event arguments</param>
-    void TcpServer_SocketStatusChange(TCPServer server, TCPServerWaitingForConnectionsEventArgs args)
+    /// <param name="clientIndex">Index of the client whose socket status has changed</param>
+    /// <param name="status">New socket status</param>
+    void TcpServer_SocketStatusChange(TCPServer server, uint clientIndex, SocketStatus status)
     {
         try
         {
-            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "TcpServerSocketStatusChange ConnectedClients: {0} ServerState: {1} Port: {2}",
-                myTcpServer.NumberOfClientsConnected, myTcpServer.State, myTcpServer.PortNumber);
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "TcpServerSocketStatusChange ConnectedClients: {0} ServerState: {1} Port: {2} ClientIndex: {3} Status: {4}",
+                myTcpServer.NumberOfClientsConnected, myTcpServer.State, myTcpServer.PortNumber, clientIndex, status);
 
             // Handle connection limit and listening state
             if (myTcpServer.MaxNumberOfClientSupported > myTcpServer.NumberOfClientsConnected)