diff --git a/device.c b/device.c
index 9f11ebb..a2ef6d9 100644
--- a/device.c
+++ b/device.c
@@ -58,18 +58,18 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
 cIptvDevice::~cIptvDevice()
 {
   debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
-  DELETE_POINTER(pIptvStreamerM);
-  DELETE_POINTER(pUdpProtocolM);
-  DELETE_POINTER(pCurlProtocolM);
-  DELETE_POINTER(pHttpProtocolM);
-  DELETE_POINTER(pFileProtocolM);
-  DELETE_POINTER(pExtProtocolM);
-  DELETE_POINTER(tsBufferM);
-  DELETE_POINTER(pPidScannerM);
-  DELETE_POINTER(pSidScannerM);
   // Stop section handler of iptv device
   StopSectionHandler();
   DELETE_POINTER(pIptvSectionM);
+  DELETE_POINTER(pSidScannerM);
+  DELETE_POINTER(pPidScannerM);
+  DELETE_POINTER(pIptvStreamerM);
+  DELETE_POINTER(pExtProtocolM);
+  DELETE_POINTER(pFileProtocolM);
+  DELETE_POINTER(pHttpProtocolM);
+  DELETE_POINTER(pCurlProtocolM);
+  DELETE_POINTER(pUdpProtocolM);
+  DELETE_POINTER(tsBufferM);
   // Close dvr fifo
   if (dvrFdM >= 0) {
      int fd = dvrFdM;
diff --git a/sectionfilter.c b/sectionfilter.c
index 375b7de..9bfcd12 100644
--- a/sectionfilter.c
+++ b/sectionfilter.c
@@ -242,6 +242,8 @@ cIptvSectionFilterHandler::~cIptvSectionFilterHandler()
   if (Running())
      Cancel(3);
 
+  DELETE_POINTER(ringBufferM);
+
   // Destroy all filters
   cMutexLock MutexLock(&mutexM);
   for (int i = 0; i < eMaxSecFilterCount; ++i)