diff --git a/js/client-battle.js b/js/client-battle.js
index 2aeed18c6..6336aa66d 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -222,7 +222,7 @@
 					}
 				} else {
 					this.controlsShown = true;
-					if (!controlsShown || !this.choice || this.choice.waiting) {
+					if (!controlsShown || (this.choice && this.choice.waiting)) {
 						this.updateControlsForPlayer();
 					}
 				}