diff --git a/cmd-find.c b/cmd-find.c
index 7ffc5f15..22511201 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -401,6 +401,7 @@ int
 cmd_find_get_session(struct cmd_find_state *fs, const char *session)
 {
 	struct session	*s, *s_loop;
+	struct client	*c;
 
 	log_debug("%s: %s", __func__, session);
 
@@ -417,6 +418,13 @@ cmd_find_get_session(struct cmd_find_state *fs, const char *session)
 	if (fs->s != NULL)
 		return (0);
 
+	/* Look for as a client. */
+	c = cmd_find_client(NULL, session, 1);
+	if (c != NULL && c->session != NULL) {
+		fs->s = c->session;
+		return (0);
+	}
+
 	/* Stop now if exact only. */
 	if (fs->flags & CMD_FIND_EXACT_SESSION)
 		return (-1);
@@ -1209,7 +1217,7 @@ cmd_find_client(struct cmd_q *cmdq, const char *target, int quiet)
 	const char	*path;
 
 	/* A NULL argument means the current client. */
-	if (target == NULL) {
+	if (cmdq != NULL && target == NULL) {
 		c = cmd_find_current_client(cmdq);
 		if (c == NULL && !quiet)
 			cmdq_error(cmdq, "no current client");