diff --git a/bsp_hosted/GlobalConfigHandler.cpp b/bsp_hosted/GlobalConfigHandler.cpp
index a2c8ff56..7a995aa3 100644
--- a/bsp_hosted/GlobalConfigHandler.cpp
+++ b/bsp_hosted/GlobalConfigHandler.cpp
@@ -81,11 +81,18 @@ void GlobalConfigHandler::readCommandQueue(){
 	if (result == RETURN_OK) {
 		return;
 	}
+
+	result = actionHelper.handleActionMessage(&command);
+	if (result == HasReturnvaluesIF::RETURN_OK) {
+		sif::debug<<"GlobalConfigHandler::readCommandQueue handleActionMessage success"<<std::endl;
+		return;
+	}
+	return;
 }
 
 ReturnValue_t GlobalConfigHandler::lockConfigFile(){
 	ReturnValue_t result = RETURN_OK;
-	result = configLock->lockMutex(MutexIF::TimeoutType::WAITING, 0);
+	result = configLock->lockMutex(MutexIF::TimeoutType::WAITING, 10);
 	return result;
 }
 ReturnValue_t GlobalConfigHandler::unlockConfigFile(){
@@ -353,5 +360,6 @@ ReturnValue_t GlobalConfigHandler::executeAction(ActionId_t actionId,
 	        MessageQueueId_t commandedBy, const uint8_t* data,
 	        size_t size) {
 
+	//Currently, no commands are used
 	return RETURN_FAILED;
 }