diff --git a/cockatrice/src/game.cpp b/cockatrice/src/game.cpp
index b6150308..5224a7c2 100644
--- a/cockatrice/src/game.cpp
+++ b/cockatrice/src/game.cpp
@@ -402,7 +402,8 @@ void Game::actRollDie()
 void Game::actCreateToken()
 {
 	QString cardname = QInputDialog::getText(0, tr("Create token"), tr("Name:"));
-	client->createToken("table", cardname, QString(), 0, 0);
+	if (!cardname.isEmpty())
+		client->createToken("table", cardname, QString(), 0, 0);
 }
 
 void Game::showCardMenu(QPoint p)