diff --git a/drivers/arista/src/main/java/org/onosproject/drivers/arista/LinkDiscoveryAristaImpl.java b/drivers/arista/src/main/java/org/onosproject/drivers/arista/LinkDiscoveryAristaImpl.java
index a32c6b7..5cf1a17 100644
--- a/drivers/arista/src/main/java/org/onosproject/drivers/arista/LinkDiscoveryAristaImpl.java
+++ b/drivers/arista/src/main/java/org/onosproject/drivers/arista/LinkDiscoveryAristaImpl.java
@@ -170,6 +170,12 @@
                     continue;
                 }
 
+                if (!localPort.get().isEnabled() || !remotePort.get().isEnabled()) {
+                    log.debug("Ports are disabled. Cannot create a link between {}/{} and {}/{}",
+                            localDeviceId, localPort.get(), remoteDevice.get().id(), remotePort.get());
+                    continue;
+                }
+
                 linkDescriptions
                         .addAll(buildLinkPair(localDeviceId, localPort.get(),
                                 remoteDevice.get().id(), remotePort.get()));
diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
index e78779e..ebb683c 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
@@ -136,6 +136,12 @@
                 continue;
             }
 
+            if (!localPort.get().isEnabled() || !remotePort.get().isEnabled()) {
+                log.debug("Ports are disabled. Cannot create a link between {}/{} and {}/{}",
+                        localDeviceId, localPort.get(), remoteDevice.id(), remotePort.get());
+                continue;
+            }
+
             JuniperUtils.createOneWayLinkDescription(localDeviceId,
                                                      localPort.get(),
                                                      remoteDevice.id(),
diff --git a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
index 09807ac..2448828 100644
--- a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
+++ b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
@@ -280,6 +280,12 @@
             DeviceId srcDeviceId = srcDevice.get().id();
             DeviceId dstDeviceId = packetContext.inPacket().receivedFrom().deviceId();
 
+            if (!sourcePort.get().isEnabled()) {
+                log.debug("Ports are disabled. Cannot create a link between {}/{} and {}/{}",
+                        srcDeviceId, sourcePort.get(), dstDeviceId, dstPort);
+                return false;
+            }
+
             ConnectPoint src = new ConnectPoint(srcDeviceId, srcPort);
             ConnectPoint dst = new ConnectPoint(dstDeviceId, dstPort);
 
