diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
index 55efa582dccf873a716ded053ed7c6789ac0c4eb..8c4e0839facce5084710e199a30e01a38a4503e0 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
@@ -28,10 +28,9 @@ public class AttachmentPoint {
 
     // Timeout for moving attachment points from OF/broadcast
     // domain to another.
-    protected static long NBD_TO_BD_TIMEDIFF_MS = 300000; // 5 minutes
     public static final long OPENFLOW_TO_EXTERNAL_TIMEOUT = 5000;  // 5 seconds
     public static final long EXTERNAL_TO_EXTERNAL_TIMEOUT = 5000;  // 5 seconds
-    public static final long CONSISTENT_TIMEOUT = 5000;            // 5 seconds
+    public static final long CONSISTENT_TIMEOUT = 30000;           // 30 seconds
 
     public AttachmentPoint(long sw, short port, long lastSeen) {
         super();