diff --git a/cmd-new-session.c b/cmd-new-session.c
index 5dc27879..64337e6d 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -239,8 +239,6 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if (ctx->cmdclient != NULL) {
 		if (!detached)
 			server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
-		else 
-			server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
 	}
 	
 	/* Set the client to the new session. */
@@ -255,7 +253,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}
 	recalculate_sizes();
 
-	return (1);	/* 1 means don't tell command client to exit */
+	return (!detached);	/* 1 means don't tell command client to exit */
 }
 
 void