diff --git a/rocclr/device/devhostcall.cpp b/rocclr/device/devhostcall.cpp
index 53cdfaa73b..bc0461dae3 100644
--- a/rocclr/device/devhostcall.cpp
+++ b/rocclr/device/devhostcall.cpp
@@ -362,11 +362,11 @@ void HostcallListener::removeBuffer(HostcallBuffer* buffer) {
 
 bool HostcallListener::initialize(const amd::Device &dev) {
   doorbell_ = dev.createSignal();
-#ifdef WITH_PAL_DEVICE
-  auto ws = device::Signal::WaitState::Active;
-#elif WITH_HSA_DEVICE
+#ifdef WITH_HSA_DEVICE
   auto ws = device::Signal::WaitState::Blocked;
-#endif 
+#elif
+  auto ws = device::Signal::WaitState::Active;
+#endif
   if ((doorbell_ == nullptr) || !doorbell_->Init(dev, SIGNAL_INIT, ws)) {
     return false;
   }
diff --git a/rocclr/device/pal/palkernel.cpp b/rocclr/device/pal/palkernel.cpp
index dcfaa045c9..20b4372e3a 100644
--- a/rocclr/device/pal/palkernel.cpp
+++ b/rocclr/device/pal/palkernel.cpp
@@ -355,7 +355,6 @@ hsa_kernel_dispatch_packet_t* HSAILKernel::loadArguments(VirtualGPU& gpu, const
           if (!buffer) {
             ClPrint(amd::LOG_ERROR, amd::LOG_KERN,
                     "Kernel expects a hostcall buffer, but none found");
-            return false;
           }
           assert(it.size_ == sizeof(buffer) && "check the sizes");
           WriteAqlArgAt(const_cast<address>(parameters), &buffer, it.size_, it.offset_);