diff --git a/source/src/client.cpp b/source/src/client.cpp
index 89634547..ef02f353 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -95,7 +95,11 @@ void connectserv_(const char *servername, const char *serverport = NULL, const c
         address.host = ENET_HOST_BROADCAST;
     }
 
-    if(!clienthost) clienthost = enet_host_create(NULL, 2, 0, 0);
+    if(!clienthost) 
+    {
+        clienthost = enet_host_create(NULL, 2, 0, 0);
+        if(clienthost) enet_host_channel_limit(clienthost, 3);
+    }
 
     if(clienthost)
     {
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 70bbec81..e2e2660a 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -3463,6 +3463,7 @@ void initserver(bool dedicated)
         if(scl.ip[0] && enet_address_set_host(&address, scl.ip)<0) logline(ACLOG_WARNING, "server ip not resolved!");
         serverhost = enet_host_create(&address, scl.maxclients+1, 0, scl.uprate);
         if(!serverhost) fatal("could not create server host");
+        enet_host_channel_limit(serverhost, 3);
         loopi(scl.maxclients) serverhost->peers[i].data = (void *)-1;
 
         maprot.init(scl.maprot);