diff --git a/CHANGES b/CHANGES
index 12d6aac1..ad215116 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+CHANGES FROM 3.1a TO 3.1b
+
+* Fix crash when allow-rename is on and an empty name is set.
+
 CHANGES FROM 3.1 TO 3.1a
 
 * Do not close stdout prematurely in control mode since it is needed to print
diff --git a/configure.ac b/configure.ac
index 6a9ba594..d5dbd9c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], 3.1a)
+AC_INIT([tmux], 3.1b)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)
diff --git a/input.c b/input.c
index 82d2b398..e794be2a 100644
--- a/input.c
+++ b/input.c
@@ -2304,7 +2304,7 @@ input_exit_rename(struct input_ctx *ictx)
 		return;
 
 	if (ictx->input_len == 0) {
-		oe = options_get(wp->window->options, "automatic-rename");
+		oe = options_get_only(wp->window->options, "automatic-rename");
 		if (oe != NULL)
 			options_remove(oe);
 		return;