diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 0f6acbf4..bc9f5585 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -90,10 +90,9 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
 			cmdq_error(cmdq, "can't find last session");
 			return (CMD_RETURN_ERROR);
 		}
+	} else {
 		if (cmdq->client == NULL)
 			return (CMD_RETURN_NORMAL);
-
-		s = state->tflag.s;
 		if (state->tflag.wl != NULL) {
 			wp = state->tflag.wp;
 			if (wp != NULL)