diff --git a/devices/bladerf2/devicebladerf2.cpp b/devices/bladerf2/devicebladerf2.cpp
index e8d88e514..8e4d96476 100644
--- a/devices/bladerf2/devicebladerf2.cpp
+++ b/devices/bladerf2/devicebladerf2.cpp
@@ -505,13 +505,13 @@ int DeviceBladeRF2::getGainModesRx(const bladerf_gain_modes **modes)
 {
     if (m_dev)
     {
-        int n = bladerf_get_gain_modes(m_dev, BLADERF_CHANNEL_RX(0), 0);
+        // int n = bladerf_get_gain_modes(m_dev, BLADERF_CHANNEL_RX(0), 0); // does not work anymore with libbladerf 2.2.1
 
-        if (n < 0)
-        {
-            qCritical("DeviceBladeRF2::getGainModesRx: Failed to get the number of Rx gain modes: %s", bladerf_strerror(n));
-            return 0;
-        }
+        // if (n < 0)
+        // {
+        //     qCritical("DeviceBladeRF2::getGainModesRx: Failed to get the number of Rx gain modes: %s", bladerf_strerror(n));
+        //     return 0;
+        // }
 
         int status = bladerf_get_gain_modes(m_dev, BLADERF_CHANNEL_RX(0), modes);
 
@@ -522,7 +522,7 @@ int DeviceBladeRF2::getGainModesRx(const bladerf_gain_modes **modes)
         }
         else
         {
-            return n;
+            return status; // This is the number of gain modes (libbladerf 2.2.1)
         }
     }
     else
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 219b34ba7..3fc002387 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -14,7 +14,7 @@ set(MBELIB_TAG 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f)
 set(SERIALDV_TAG "v1.1.2")
 set(DSDCC_TAG "v1.8.6")
 set(LIMESUITE_TAG "v19.01.0")
-set(BLADERF_TAG "2018.10-rc1")
+set(BLADERF_TAG "2019.07")
 set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d)
 set(AIRSPYHF_TAG "1.1.5")
 set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028)