diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeFlowRuleProgrammable.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeFlowRuleProgrammable.java
index 7432d2d..fbc512a 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeFlowRuleProgrammable.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeFlowRuleProgrammable.java
@@ -421,12 +421,20 @@
             if (piEntryToApply.isDefaultAction()) {
                 // Cannot remove default action. Instead we should use the
                 // original defined by the interpreter (if any).
-                piEntryToApply = getOriginalDefaultEntry(piEntryToApply.table());
-                if (piEntryToApply == null) {
+                final PiTableEntry originalDefaultEntry = getOriginalDefaultEntry(
+                        piEntryToApply.table());
+                if (originalDefaultEntry == null) {
                     return false;
                 }
-                updateType = MODIFY;
+                return appendEntryToWriteRequestOrSkip(
+                        writeRequest, originalDefaultEntry.handle(deviceId),
+                        originalDefaultEntry, APPLY);
             } else {
+                if (piEntryOnDevice == null) {
+                    log.debug("Ignoring delete of missing entry: {}",
+                              piEntryToApply);
+                    return true;
+                }
                 updateType = DELETE;
             }
         }