diff --git a/src/vm/VirtualMachineContext.cc b/src/vm/VirtualMachineContext.cc
index 5cb0b4d273..96a1e52744 100644
--- a/src/vm/VirtualMachineContext.cc
+++ b/src/vm/VirtualMachineContext.cc
@@ -339,6 +339,20 @@ int VirtualMachine::generate_network_context(VectorAttribute* context,
             continue;
         }
 
+        if (hasPreviousHistory() &&
+            previous_history->action == VMActions::NIC_DETACH_ACTION &&
+            vatts[i]->vector_value("ATTACH") == "YES")
+        {
+            int nic_id;
+
+            vatts[i]->vector_value("NIC_ID", nic_id);
+
+            clear_nic_context(nic_id);
+
+            continue;
+        }
+
+
         bool alias_detach = hasPreviousHistory() &&
             previous_history->action == VMActions::ALIAS_DETACH_ACTION &&
             vatts[i]->vector_value("ATTACH") == "YES";