diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index ee07183..d669d72 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -265,10 +265,17 @@
         @Override
         public void event(DeviceEvent event) {
             Device device = event.subject();
-            if (event.type() == DeviceEvent.Type.DEVICE_ADDED) {
-                for (PacketRequest request : store.existingRequests()) {
-                    pushRule(device, request);
-                }
+            switch (event.type()) {
+                case DEVICE_ADDED:
+                case DEVICE_AVAILABILITY_CHANGED:
+                    if (deviceService.isAvailable(event.subject().id())) {
+                        for (PacketRequest request : store.existingRequests()) {
+                            pushRule(device, request);
+                        }
+                    }
+                    break;
+                default:
+                    break;
             }
         }
     }