diff --git a/applications/message_handler_openamp/core_driver_mutex.cpp b/applications/message_handler_openamp/core_driver_mutex.cpp
index d023ad2..7948bd0 100644
--- a/applications/message_handler_openamp/core_driver_mutex.cpp
+++ b/applications/message_handler_openamp/core_driver_mutex.cpp
@@ -1,6 +1,5 @@
 /*
  * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the License); you may
@@ -52,10 +51,10 @@
     return xSemaphoreCreateCounting(255, 0);
 }
 
-int ethosu_semaphore_take(void *sem) {
+int ethosu_semaphore_take(void *sem, uint64_t timeout) {
     SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem);
-    if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) {
-        printf("Error: Failed to take semaphore.\n");
+    if (xSemaphoreTake(handle, (TickType_t)timeout) != pdTRUE) {
+        // Semaphore take timed out
         return -1;
     }
     return 0;