diff --git a/src/game/client/components/voting.cpp b/src/game/client/components/voting.cpp
index 1eebaf264..392b19371 100644
--- a/src/game/client/components/voting.cpp
+++ b/src/game/client/components/voting.cpp
@@ -148,6 +148,9 @@ CVoting::CVoting()
 
 void CVoting::AddOption(const char *pDescription)
 {
+	if(m_NumVoteOptions == MAX_VOTE_OPTIONS)
+		return;
+
 	CVoteOptionClient *pOption;
 	if(m_pRecycleFirst)
 	{