diff --git a/client/client.js b/client/client.js
index 3624925..5665097 100644
--- a/client/client.js
+++ b/client/client.js
@@ -320,7 +320,10 @@ function join(channel) {
 			if (location.hash) {
 				myNick = location.hash.substr(1);
 			} else {
-				myNick = prompt('Nickname:', myNick);
+				var newNick = prompt('Nickname:', myNick);
+				if (newNick !== null) {
+					myNick = newNick;
+				}
 			}
 		}