diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index a83dc38e47..0287e320a0 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -415,7 +415,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendKeyPasswordPacket(PacketTy
 
 	byte shared_secret[32]; // Shared secret
 	crypto_x25519(shared_secret, keys.x25519_priv_key, _server_x25519_pub_key);
-	if (std::count(shared_secret, shared_secret + 32, 0) == 32) {
+	if (std::all_of(shared_secret, shared_secret + 32, [](auto v) { return v == 0; })) {
 		/* Secret is all 0 because public key is all 0, just give up at this point */
 		return NETWORK_RECV_STATUS_MALFORMED_PACKET;
 	}
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index d4baac5a82..62689498e4 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -242,7 +242,7 @@ bool ServerNetworkGameSocketHandler::ParseKeyPasswordPacket(Packet *p, NetworkSh
 
 	byte shared_secret[32]; // Shared secret
 	crypto_x25519(shared_secret, keys.x25519_priv_key, client_pub_key);
-	if (std::count(shared_secret, shared_secret + 32, 0) == 32) {
+	if (std::all_of(shared_secret, shared_secret + 32, [](auto v) { return v == 0; })) {
 		/* Secret is all 0 because public key is all 0, just reject it */
 		return false;
 	}