diff --git a/client/tarantool/tc.c b/client/tarantool/tc.c
index e42708d67ef882df2a725d680a10f10bc913fbde..117e6e27ce438c095de0300c0f714b8c5f01d034 100644
--- a/client/tarantool/tc.c
+++ b/client/tarantool/tc.c
@@ -45,9 +45,12 @@
 #include "client/tarantool/tc.h"
 #include "client/tarantool/tc_cli.h"
 #include "client/tarantool/tc_print.h"
+#include "client/tarantool/tc_store.h"
+#include "client/tarantool/tc_query.h"
 #include "client/tarantool/tc_print_snap.h"
 #include "client/tarantool/tc_print_xlog.h"
-#include "client/tarantool/tc_store.h"
+
+#define TC_DEFAULT_PORT 33013
 
 struct tc tc;
 
@@ -79,6 +82,8 @@ void tc_error(char *fmt, ...) {
 
 static void tc_connect(void)
 {
+	if (tc.opt.port == 0)
+		tc.opt.port = TC_DEFAULT_PORT;
 	/* allocating stream */
 	tc.net = tnt_net(NULL);
 	if (tc.net == NULL)
@@ -95,12 +100,29 @@ static void tc_connect(void)
 		tc_error("%s", tnt_strerror(tc.net));
 }
 
+static int get_primary_port(void)
+{
+	char *reply = NULL;
+	size_t size = 0;
+	int port = 0;
+	if (tc_admin_query(&tc.admin, "lua box.cfg.primary_port") == -1)
+		tc_error("cannot send query");
+	if (tc_admin_reply(&tc.admin, &reply, &size) == -1)
+		tc_error("cannot recv query");
+	sscanf(reply, "---\n - %d\n...", &port);
+	free(reply);
+	return port;
+}
+
 static void tc_connect_admin(void)
 {
+
 	if (tc_admin_connect(&tc.admin,
 			     tc.opt.host,
 			     tc.opt.port_admin) == -1)
 		tc_error("admin console connection failed");
+	if (tc.opt.port == 0)
+		tc.opt.port = get_primary_port();
 }
 
 static void tc_validate(void)
@@ -108,12 +130,11 @@ static void tc_validate(void)
 	tc.opt.xlog_printer = tc_print_getxlogcb(tc.opt.format);
 	tc.opt.snap_printer = tc_print_getsnapcb(tc.opt.format);
 	if (tc.opt.xlog_printer == NULL)
-		return tc_error("unsupported output xlog format '%s'",
+		tc_error("unsupported output xlog format '%s'",
 				tc.opt.format);
 	if (tc.opt.snap_printer == NULL)
-		return tc_error("unsupported output snap format '%s'",
+		tc_error("unsupported output snap format '%s'",
 				tc.opt.format);
-	
 	if (tc.opt.format && strcmp(tc.opt.format, "raw") == 0)
 		tc.opt.raw = 1;
 }
@@ -144,13 +165,13 @@ int main(int argc, char *argv[])
 		rc = tc_store_play();
 		break;
 	case TC_OPT_CMD:
-		tc_connect();
 		tc_connect_admin();
+		tc_connect();
 		rc = tc_cli_cmdv();
 		break;
 	case TC_OPT_INTERACTIVE:
-		tc_connect();
 		tc_connect_admin();
+		tc_connect();
 		tc_cli_motd();
 		rc = tc_cli();
 		break;
diff --git a/client/tarantool/tc_cli.c b/client/tarantool/tc_cli.c
index f6ea1ea346f90abe240f8a6fcf1c164a926ef4c4..90894ee554fe2f588923cd59a45ce024f9101f5e 100644
--- a/client/tarantool/tc_cli.c
+++ b/client/tarantool/tc_cli.c
@@ -109,7 +109,6 @@ static struct tnt_lex_keyword tc_lex_keywords[] =
 	{ "notee", 5, TC_NOTEE },
 	{ "loadfile", 8, TC_LOADFILE },
 	{ "setopt", 6, TC_SETOPT},
-	{ "delim", 5, TC_SETOPT_DELIM},
 	{ "delimiter", 9, TC_SETOPT_DELIM},
 	{ NULL, 0, TNT_TK_NONE }
 };
diff --git a/client/tarantool/tc_opt.c b/client/tarantool/tc_opt.c
index 93d0f4a00836edaf073efdbc0eb4d4245088ee24..c0096a275caf313d3acaa3e4fa7a65ade1dfec5a 100644
--- a/client/tarantool/tc_opt.c
+++ b/client/tarantool/tc_opt.c
@@ -37,7 +37,6 @@
 
 
 #define TC_DEFAULT_HOST "localhost"
-#define TC_DEFAULT_PORT 33013
 #define TC_DEFAULT_PORT_ADMIN 33015
 
 /* supported cli options */
@@ -116,7 +115,7 @@ enum tc_opt_mode tc_opt_init(struct tc_opt *opt, int argc, char **argv)
 
 	/* server port */
 	const char *arg = NULL;
-	opt->port = TC_DEFAULT_PORT;
+	opt->port = 0;
 	if (gopt_arg(tc_options, 'p', &arg))
 		opt->port = atoi(arg);