diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/io_streaming/src/FakeIOPipes.hpp b/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/io_streaming/src/FakeIOPipes.hpp
index 27321086fb..48cd914670 100644
--- a/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/io_streaming/src/FakeIOPipes.hpp
+++ b/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/io_streaming/src/FakeIOPipes.hpp
@@ -66,16 +66,13 @@ class ProducerConsumerBaseImpl {
     // check for USM support
     device d = q.get_device();
 
-#if defined (IS_BSP)
-    // make sure the device supports USM device allocations in BSP mode
-    if (!d.get_info<info::device::usm_host_allocations>() && use_host_alloc) {
+    if (use_host_alloc && !d.get_info<info::device::usm_host_allocations>()) {
       std::cerr << "ERROR: The selected device does not support USM host"
                 << " allocations\n";
       std::terminate();
     }
-#endif
 
-    if (!d.get_info<info::device::usm_device_allocations>()) {
+    if (!use_host_alloc && !d.get_info<info::device::usm_device_allocations>()) {
       std::cerr << "ERROR: The selected device does not support USM device"
                 << " allocations\n";
       std::terminate();