diff --git a/NetworkServer.cpp b/NetworkServer.cpp
index 663d906b..083b4534 100644
--- a/NetworkServer.cpp
+++ b/NetworkServer.cpp
@@ -288,6 +288,11 @@ void NetworkServer::StartServer()
             return;
         }
 
+        /*---------------------------------------------------------*\
+        | Set socket options - reuse addr                           |
+        \*---------------------------------------------------------*/
+        setsockopt(server_sock[socket_count], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
         /*---------------------------------------------------------*\
         | Bind the server socket                                    |
         \*---------------------------------------------------------*/
diff --git a/net_port/net_port.cpp b/net_port/net_port.cpp
index 532b9e50..3714642d 100644
--- a/net_port/net_port.cpp
+++ b/net_port/net_port.cpp
@@ -267,6 +267,11 @@ bool net_port::tcp_server(const char * port)
     myAddress.sin_addr.s_addr = inet_addr("0.0.0.0");
     myAddress.sin_port = htons(atoi(port));
 
+    /*-------------------------------------------------*\
+    | Set socket options - reuse addr                   |
+    \*-------------------------------------------------*/
+    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
     /*-------------------------------------------------*\
     | Bind the server socket                            |
     \*-------------------------------------------------*/