diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
index 1fa55f967..b009e398f 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
+++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp
@@ -83,9 +83,9 @@ bool BladerfOutput::openDevice()
     }
     else
     {
-        if (!DeviceBladeRF::open_bladerf(&m_dev, 0)) // TODO: fix; Open first available device as there is no proper handling for multiple devices
+        if (!DeviceBladeRF::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSinkSerial())))
         {
-            qCritical("BladerfOutput::start: could not open BladeRF");
+            qCritical("BladerfOutput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSampleSinkSerial()));
             return false;
         }
 
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp
index b2818aad1..4c3544155 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp
@@ -88,9 +88,9 @@ bool BladerfInput::openDevice()
     }
     else
     {
-        if (!DeviceBladeRF::open_bladerf(&m_dev, 0)) // TODO: fix; Open first available device as there is no proper handling for multiple devices
+        if (!DeviceBladeRF::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSourceSerial())))
         {
-            qCritical("BladerfInput::start: could not open BladeRF");
+            qCritical("BladerfInput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSampleSourceSerial()));
             return false;
         }