diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index 6121a0502..378a4583e 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -64,6 +64,7 @@
  * 22/10/2013	Massimiliano Pinto	errorReply called from backend, for client error reply
  *					or take different actions such as open a new backend connection
  * 20/02/2014	Massimiliano Pinto	If router_options=slave, route traffic to master if no slaves available
+ * 06/03/2014	Massimiliano Pinto	Server connection counter is now updated in closeSession
  *
  * @endverbatim
  */
@@ -468,7 +469,6 @@ static void freeSession(
         prev_val = atomic_add(&router_cli_ses->backend->current_connection_count, -1);
         ss_dassert(prev_val > 0);
         
-	atomic_add(&router_cli_ses->backend->server->stats.n_current, -1);
 	spinlock_acquire(&router->lock);
         
 	if (router->connections == router_cli_ses) {
@@ -519,6 +519,9 @@ DCB*              backend_dcb;
          */
         if (rses_begin_router_action(router_cli_ses))
         {
+		/* decrease server current connection counter */
+		atomic_add(&router_cli_ses->backend->server->stats.n_current, -1);
+
                 backend_dcb = router_cli_ses->backend_dcb;
                 router_cli_ses->backend_dcb = NULL;
                 router_cli_ses->rses_closed = true;
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index b6ed199ff..972b5ad76 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -49,6 +49,7 @@ extern int lm_enabled_logfiles_bitmask;
  *					for all reply situations
  * 18/07/2013	Massimiliano Pinto	routeQuery now handles COM_QUIT
  *					as QUERY_TYPE_SESSION_WRITE
+ * 17/07/2014	Massimiliano Pinto	Server connection counter is updated in closeSession
  *
  * @endverbatim
  */
@@ -373,6 +374,11 @@ static void closeSession(
          */
         if (rses_begin_router_action(router_cli_ses))
         {
+
+		/* decrease server current connection counters */
+		atomic_add(&router_cli_ses->be_slave->backend_server->stats.n_current, -1);
+		atomic_add(&router_cli_ses->be_master->backend_server->stats.n_current, -1);
+
                 slave_dcb = router_cli_ses->slave_dcb;
                 router_cli_ses->slave_dcb = NULL;
                 master_dcb = router_cli_ses->master_dcb;
@@ -409,8 +415,6 @@ static void freeSession(
 
         atomic_add(&router_cli_ses->be_slave->backend_conn_count, -1);
         atomic_add(&router_cli_ses->be_master->backend_conn_count, -1);
-        atomic_add(&router_cli_ses->be_slave->backend_server->stats.n_current, -1);
-        atomic_add(&router_cli_ses->be_master->backend_server->stats.n_current, -1);
 
         spinlock_acquire(&router->lock);