diff --git a/examples/boot_bootloader.cpp b/examples/boot_bootloader.cpp
index 9fc8543..60bbd55 100644
--- a/examples/boot_bootloader.cpp
+++ b/examples/boot_bootloader.cpp
@@ -27,7 +27,7 @@ int main(){
     suitableDevice.platform = X_LINK_ANY_PLATFORM;
     suitableDevice.state = X_LINK_FLASH_BOOTED;
 
-    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev);
+    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev, XLINK_DEVICE_DEFAULT_SEARCH_TIMEOUT_MS);
     if(status != X_LINK_SUCCESS) throw std::runtime_error("Couldn't retrieve all connected devices");
 
     if(numdev == 0){
diff --git a/examples/boot_firmware.cpp b/examples/boot_firmware.cpp
index a7f4da8..6f70662 100644
--- a/examples/boot_firmware.cpp
+++ b/examples/boot_firmware.cpp
@@ -32,7 +32,7 @@ int main(int argc, const char** argv){
     suitableDevice.platform = X_LINK_ANY_PLATFORM;
     suitableDevice.state = X_LINK_UNBOOTED;
 
-    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev);
+    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev, XLINK_DEVICE_DEFAULT_SEARCH_TIMEOUT_MS);
     if(status != X_LINK_SUCCESS) throw std::runtime_error("Couldn't retrieve all connected devices");
 
     if(numdev == 0){
diff --git a/examples/list_devices.cpp b/examples/list_devices.cpp
index f726818..620d7d2 100644
--- a/examples/list_devices.cpp
+++ b/examples/list_devices.cpp
@@ -27,7 +27,7 @@ int main(){
     suitableDevice.protocol = X_LINK_ANY_PROTOCOL;
     suitableDevice.platform = X_LINK_ANY_PLATFORM;
 
-    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev);
+    status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev, XLINK_DEVICE_DEFAULT_SEARCH_TIMEOUT_MS);
     if(status != X_LINK_SUCCESS) throw std::runtime_error("Couldn't retrieve all connected devices");
 
     // Print device details
diff --git a/src/pc/protocols/tcpip_host.cpp b/src/pc/protocols/tcpip_host.cpp
index 62a0f18..e6924db 100644
--- a/src/pc/protocols/tcpip_host.cpp
+++ b/src/pc/protocols/tcpip_host.cpp
@@ -141,7 +141,6 @@ static constexpr const auto DEFAULT_DEVICE_DISCOVERY_POOL_TIMEOUT = std::chrono:
 
 constexpr int MSEC_TO_USEC(int x) { return x * 1000; }
 static constexpr auto DEVICE_DISCOVERY_SOCKET_TIMEOUT = std::chrono::milliseconds{20};
-static constexpr auto DEVICE_DISCOVERY_RES_TIMEOUT = std::chrono::milliseconds{500};
 
 #ifdef HAS_DEBUG
 #define DEBUG(...) do { printf(__VA_ARGS__); } while(0)
@@ -612,7 +611,7 @@ xLinkPlatformErrorCode_t tcpip_perform_search(void* ctx, deviceDesc_t* devices,
                 num_devices_match++;
             }
         }
-    } while(std::chrono::steady_clock::now() - t1 < DEVICE_DISCOVERY_RES_TIMEOUT);
+    } while(std::chrono::steady_clock::now() - t1 < std::chrono::milliseconds(XLINK_DEVICE_DEFAULT_SEARCH_TIMEOUT_MS));
 
     // if at least one device matched, return OK otherwise return not found
     if(num_devices_match <= 0)
diff --git a/tests/multithreading_search_test.cpp b/tests/multithreading_search_test.cpp
index f36b6d7..a84fad5 100644
--- a/tests/multithreading_search_test.cpp
+++ b/tests/multithreading_search_test.cpp
@@ -41,7 +41,7 @@ int main() {
             suitableDevice.protocol = X_LINK_ANY_PROTOCOL;
             suitableDevice.platform = X_LINK_ANY_PLATFORM;
 
-            auto status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev);
+            auto status = XLinkFindAllSuitableDevices(suitableDevice, deviceDescAll.data(), deviceDescAll.size(), &numdev, XLINK_DEVICE_DEFAULT_SEARCH_TIMEOUT_MS);
             if(status != X_LINK_SUCCESS) throw std::runtime_error("Couldn't retrieve all connected devices");
 
             // Print device details