diff --git a/server/core/server.c b/server/core/server.c
index 7358897fd..eff77c937 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -246,7 +246,7 @@ char	*stat;
 		dcb_printf(dcb, "\tPort:			%d\n", ptr->port);
 		if (ptr->server_string)
 			dcb_printf(dcb, "\tServer Version:\t\t%s\n", ptr->server_string);
-		dcb_printf(dcb, "\tNode Id:			%d\n", ptr->node_id);
+		dcb_printf(dcb, "\tNode Id:		%d\n", ptr->node_id);
 		dcb_printf(dcb, "\tNumber of connections:	%d\n", ptr->stats.n_connections);
 		dcb_printf(dcb, "\tCurrent no. of conns:	%d\n", ptr->stats.n_current);
 		ptr = ptr->next;
@@ -274,7 +274,7 @@ char	*stat;
 	dcb_printf(dcb, "\tPort:			%d\n", server->port);
 	if (server->server_string)
 		dcb_printf(dcb, "\tServer Version:\t\t%s\n", server->server_string);
-	dcb_printf(dcb, "\tNode Id:			%d\n", server->node_id);
+	dcb_printf(dcb, "\tNode Id:		%d\n", server->node_id);
 	dcb_printf(dcb, "\tNumber of connections:	%d\n", server->stats.n_connections);
 	dcb_printf(dcb, "\tCurrent No. of conns:	%d\n", server->stats.n_current);
 }
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 554f3810f..ddf1f7cbc 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -334,6 +334,25 @@ char 			*server_string;
 		database->server->server_string = strdup(server_string);
 	}
 
+        /* get server_id form current node */
+        if (mysql_query(database->con, "SELECT @@server_id") == 0
+                && (result = mysql_store_result(database->con)) != NULL)
+        {
+                long server_id = -1;
+                num_fields = mysql_num_fields(result);
+                while ((row = mysql_fetch_row(result)))
+                {
+                        server_id = strtol(row[0], NULL, 10);
+                        if ((errno == ERANGE && (server_id == LONG_MAX
+                                || server_id == LONG_MIN)) || (errno != 0 && server_id == 0))
+                        {
+                                server_id = -1;
+                        }
+                        database->server->node_id = server_id;
+                }
+                mysql_free_result(result);
+        }
+
 	/* Check SHOW SLAVE HOSTS - if we get rows then we are a master */
 	if (mysql_query(database->con, "SHOW SLAVE HOSTS"))
 	{