diff --git a/src/devices/wifi/wifi-net-device.cc b/src/devices/wifi/wifi-net-device.cc
index 84910b5f9..dfe192f4b 100644
--- a/src/devices/wifi/wifi-net-device.cc
+++ b/src/devices/wifi/wifi-net-device.cc
@@ -223,6 +223,18 @@ WifiNetDevice::DoDispose (void)
   NetDevice::DoDispose ();
   // cleanup local
   m_channel = 0;
+  delete m_phy;
+  delete m_stations;
+  delete m_low;
+  delete m_rxMiddle;
+  delete m_txMiddle;
+  delete m_parameters;
+  m_phy = 0;
+  m_stations = 0;
+  m_low = 0;
+  m_rxMiddle = 0;
+  m_txMiddle = 0;
+  m_parameters = 0;
 }
 
 
diff --git a/src/devices/wifi/wifi-phy.cc b/src/devices/wifi/wifi-phy.cc
index 3df3fb71f..92f857f64 100644
--- a/src/devices/wifi/wifi-phy.cc
+++ b/src/devices/wifi/wifi-phy.cc
@@ -198,6 +198,7 @@ WifiPhy::WifiPhy (Ptr<WifiNetDevice> device)
 
 WifiPhy::~WifiPhy ()
 {
+  m_channel = 0;
   m_events.clear ();
   m_modes.clear ();
 }