diff --git a/src/switch_console.c b/src/switch_console.c
index e3cafa9ada..5a071a18f1 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -431,8 +431,6 @@ static unsigned char console_f12key(EditLine * el, int ch)
 char *prompt(EditLine * e)
 {
 	if (*prompt_str == '\0') {
-		gethostname(hostname, sizeof(hostname));
-		switch_core_set_variable("hostname", hostname);
 		switch_snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname);
 	}
 
@@ -739,6 +737,8 @@ SWITCH_DECLARE(void) switch_console_loop(void)
 	switch_threadattr_t *thd_attr = NULL;
 	switch_memory_pool_t *pool;
 
+	gethostname(hostname, sizeof(hostname));
+
 	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
 		return;