diff --git a/core/domain/src/main/java/org/mobicents/smsc/domain/DatabaseSmsRoutingRule.java b/core/domain/src/main/java/org/mobicents/smsc/domain/DatabaseSmsRoutingRule.java
index 0adf4c955..19d4384b2 100644
--- a/core/domain/src/main/java/org/mobicents/smsc/domain/DatabaseSmsRoutingRule.java
+++ b/core/domain/src/main/java/org/mobicents/smsc/domain/DatabaseSmsRoutingRule.java
@@ -103,7 +103,7 @@ public String getEsmeClusterName(int ton, int npi, String address, String name,
                 if (smscPropertiesManagement != null) {
                     String dcn = smscPropertiesManagement.getEsmeDefaultClusterName();
                     if (dcn != null) {
-                        if (esmeManagement.getEsmeByClusterName(dcn) != null) {
+                        if (esmeManagement.getEsmeByClusterName(dcn, true) != null) {
                             clusterName = dcn;
                         }
                     }
diff --git a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
index 8228b872d..92e76ce54 100644
--- a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
+++ b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
@@ -717,7 +717,7 @@ protected EsmeManagementProxy2() {
         }
 
         @Override
-        public Esme getEsmeByClusterName(String esmeClusterName) {
+        public Esme getEsmeByClusterName(String esmeClusterName, final boolean anIndexUpdate) {
             return esme;
         }
     }
diff --git a/core/slee/services/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java b/core/slee/services/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
index 030b37c89..f71ed9d0e 100644
--- a/core/slee/services/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
+++ b/core/slee/services/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
@@ -585,7 +585,7 @@ private void sendDeliverSm(SmsSet smsSet) throws SmscProcessingException {
             }
 
             EsmeManagement esmeManagement = EsmeManagement.getInstance();
-			Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName());
+			Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName(), true);
 			if (esme == null) {
 				String s = "\nRxSmppServerSbb.sendDeliverSm(): Received DELIVER_SM SmsEvent but no Esme found for destClusterName: "
 						+ smsSet.getDestClusterName() + ", smsSet=" + smsSet;
@@ -953,7 +953,7 @@ private void handleResponse(BaseSmResp event) throws Exception {
             smscStatAggregator.updateMsgOutSentSmpp();
 
             EsmeManagement esmeManagement = EsmeManagement.getInstance();
-			Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName());
+			Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName(), false);
 			boolean destAddressLimitationEnabled = esme.getDestAddrSendLimit() != 0;
 			
             int realID=-1;