diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
index 06168ec45..5fa871501 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
+++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
@@ -43,8 +43,12 @@ BladerfOutput::BladerfOutput(DeviceSinkAPI *deviceAPI) :
 
 BladerfOutput::~BladerfOutput()
 {
-	stop();
-	m_deviceAPI->setBuddySharedPtr(0);
+    if (m_dev != 0)
+    {
+        stop();
+    }
+
+    m_deviceAPI->setBuddySharedPtr(0);
 }
 
 bool BladerfOutput::init(const Message& cmd)
@@ -183,7 +187,6 @@ void BladerfOutput::stop()
             if(m_dev != 0) // close BladeRF
             {
                 bladerf_close(m_dev);
-                m_dev = 0;
             }
         }
     }
@@ -194,11 +197,11 @@ void BladerfOutput::stop()
         if(m_dev != 0) // close BladeRF
         {
             bladerf_close(m_dev);
-            m_dev = 0;
         }
     }
 
     m_sharedParams.m_dev = 0;
+    m_dev = 0;
 }
 
 const QString& BladerfOutput::getDeviceDescription() const
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp
index 774c6e858..e68bd5dec 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp
@@ -44,8 +44,12 @@ BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) :
 
 BladerfInput::~BladerfInput()
 {
-	stop();
-	m_deviceAPI->setBuddySharedPtr(0);
+    if (m_dev != 0)
+    {
+        stop();
+    }
+
+    m_deviceAPI->setBuddySharedPtr(0);
 }
 
 bool BladerfInput::init(const Message& cmd)
@@ -197,7 +201,6 @@ void BladerfInput::stop()
             if(m_dev != 0) // close BladeRF
             {
                 bladerf_close(m_dev);
-                m_dev = 0;
             }
         }
     }
@@ -206,11 +209,11 @@ void BladerfInput::stop()
         if(m_dev != 0) // close BladeRF
         {
             bladerf_close(m_dev);
-            m_dev = 0;
         }
     }
 
     m_sharedParams.m_dev = 0;
+    m_dev = 0;
 
 //	if(m_dev != 0)
 //	{