diff --git a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
index f250660..2f0d5d8 100644
--- a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
+++ b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
@@ -166,10 +166,11 @@
      *
      * @param port the port
      */
-    public void removePort(final OFPort port) {
+    public void removePort(final OFPortDesc port) {
         // Ignore ports that are not on this switch
 
-        int portnum = port.getPortNumber();
+        int portnum = port.getPortNo().getPortNumber();
+        this.ports.remove(portnum);
         synchronized (this) {
             if (this.slowPorts.contains(portnum)) {
                 this.slowPorts.remove(portnum);
@@ -383,7 +384,7 @@
 
     public void removeAllPorts() {
         for (OFPortDesc port : sw.getPorts()) {
-            removePort(port.getPortNo());
+            removePort(port);
         }
     }