diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index c617d282ea6d7b8385ce8f403c2aa2c9fee676e3..9f1209d75dfdfcba0c0cf2ddafea0424dd5ce7bd 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -214,8 +214,8 @@ IFloodlightModule, IInfoProvider {
 	/*
 	 * Latency tracking
 	 */
-	protected static int LATENCY_HISTORY_SIZE = 5;
-	protected static double LATENCY_UPDATE_THRESHOLD = 0.30;
+	protected static int LATENCY_HISTORY_SIZE = 10;
+	protected static double LATENCY_UPDATE_THRESHOLD = 0.50;
 
 	/**
 	 * Flag to indicate if automatic port fast is enabled or not. Default is set
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkInfo.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkInfo.java
index a892787b12f9b986c8bb7467710865666ba748b7..ee7a1fce484595114b25b68e150d7b2c5479e251 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkInfo.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkInfo.java
@@ -104,7 +104,7 @@ public class LinkInfo {
 		if (newLatency != null) {
 			/* check threshold */
 			if ((((double) Math.abs(newLatency.getValue() - currentLatency.getValue())) 
-					/ currentLatency.getValue()
+					/ (currentLatency.getValue() == 0 ? 1 : currentLatency.getValue())
 					) 
 					>= latencyUpdateThreshold) {
 				/* perform update */
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index d18409ce65a6e792e68c404e727e2ee923915bcb..a838b13188514ddc2db698122563ab3387fe3364 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -24,7 +24,7 @@ net.floodlightcontroller.forwarding.Forwarding.match=vlan, mac, ip, transport
 net.floodlightcontroller.core.internal.FloodlightProvider.openflowPort=6653
 net.floodlightcontroller.core.internal.FloodlightProvider.role=ACTIVE
 net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-history-size=10
-net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-update-threshold=0.3
+net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-update-threshold=0.5
 net.floodlightcontroller.core.internal.OFSwitchManager.defaultMaxTablesToReceiveTableMissFlow=2
 net.floodlightcontroller.core.internal.OFSwitchManager.maxTablesToReceiveTableMissFlowPerDpid={"00:00:00:00:00:00:00:01":"1","2":"1"}
 net.floodlightcontroller.core.internal.OFSwitchManager.clearTablesOnInitialHandshakeAsMaster=YES