diff --git a/skywalking-api/pom.xml b/skywalking-api/pom.xml
index fcf5ce51ee0c97319ffd0345068549b3c796941a..93965ccaee6f8e5202a80ef65377f49199e7a1d4 100644
--- a/skywalking-api/pom.xml
+++ b/skywalking-api/pom.xml
@@ -134,4 +134,12 @@
 			</plugin>
 		</plugins>
 	</build>
+	
+	<distributionManagement>
+		<snapshotRepository>
+			<id>company-private-nexus-library-snapshots</id>
+			<name>company-private-nexus-library-snapshots</name>
+			<url>http://10.1.228.199:18081/nexus/content/repositories/snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>
diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java
index 5a2662c2c8ef1602a04633fa28e3053c8db79905..8a021aef5b7daf75c7a9b01d6ba61d986fb73ca8 100644
--- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java
@@ -135,7 +135,7 @@ public class DataSenderFactoryWithBalance {
                     }
 
                     // try to fill up senders. if size is not enough.
-                    while (usingDataSender.size() < maxKeepConnectingSenderSize) {
+                    while (unusedServerAddresses.size() > 0 && usingDataSender.size() < maxKeepConnectingSenderSize) {
                         if ((newSender = findReadySender()) == null) {
                             // no available sender. ignore.
                             break;
@@ -145,7 +145,7 @@ public class DataSenderFactoryWithBalance {
                     }
 
                     // try to switch.
-                    if (sleepTime >= SWITCH_SENDER_INTERVAL) {
+                    if (sleepTime >= SWITCH_SENDER_INTERVAL && unusedServerAddresses.size() > 0) {
                         // if sender is enough, go to switch for balancing.
                         if (usingDataSender.size() >= maxKeepConnectingSenderSize) {
                             DataSender toBeSwitchSender;