1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp
index 02b3e66c3..8586aa3a9 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.cpp
@@ -645,7 +645,9 @@ device_addrs_t mpmd_find_with_addrs(const device_addrs_t& hints)
             "Device responded: " << reply_addrs[0].to_string());
         found_devices.push_back(reply_addrs[0]);
     }
-    if (found_devices.size() == 1) {
+    if (found_devices.size() == 0) {
+        return device_addrs_t();
+    } else if (found_devices.size() == 1) {
         return found_devices;
     } else {
         return device_addrs_t(1, combine_device_addrs(found_devices));