diff --git a/src/net/clientthread.h b/src/net/clientthread.h
index 09894fb5..cf09819f 100644
--- a/src/net/clientthread.h
+++ b/src/net/clientthread.h
@@ -72,7 +72,7 @@ public:
 		return *std::max_element(pingValues.begin(), pingValues.end());
 	}
 	unsigned AveragePing() {
-		return std::accumulate(pingValues.begin(), pingValues.end(), 0) / (unsigned)pingValues.size();
+		return pingValues.empty() ? 0 : (std::accumulate(pingValues.begin(), pingValues.end(), 0) / (unsigned)pingValues.size());
 	}
 	void StartPing() {
 		pingTimer.start();