diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 89641ace11..547cface08 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -363,7 +363,7 @@ enabledmods = "mod public"
 [network]
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
 lateobserverjoins = false         ; Allow observers to join the game after it started
-observerlimit = 6                 ; Prevent further observer joins in running games if this limit is reached
+observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
 
 [overlay]
 fps = "false"                     ; Show frames per second in top right corner
diff --git a/binaries/data/mods/public/gui/options/options.json b/binaries/data/mods/public/gui/options/options.json
index c95d59b4c7..ca25a47dc4 100644
--- a/binaries/data/mods/public/gui/options/options.json
+++ b/binaries/data/mods/public/gui/options/options.json
@@ -83,7 +83,7 @@
 			"type": "number",
 			"label": "Observer Limit",
 			"tooltip": "Prevent further observer from joining if the limit is reached",
-			"parameters": { "config": "network.observerlimit", "min": 0, "max": 16 }
+			"parameters": { "config": "network.observerlimit", "min": 0, "max": 32 }
 		},
 		{
 			"type": "number",
diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp
index 50e8d19798..f329947c30 100644
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@@ -44,9 +44,9 @@
  * Number of peers to allocate for the enet host.
  * Limited by ENET_PROTOCOL_MAXIMUM_PEER_ID (4096).
  *
- * At most 8 players, 16 observers and 1 temporary connection to send the "server full" disconnect-reason.
+ * At most 8 players, 32 observers and 1 temporary connection to send the "server full" disconnect-reason.
  */
-#define MAX_CLIENTS 25
+#define MAX_CLIENTS 41
 
 #define	DEFAULT_SERVER_NAME			L"Unnamed Server"
 #define DEFAULT_WELCOME_MESSAGE		L"Welcome"