diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp
index aef2fd05b0d9662892394d5bab5f306a89ac209d..e3bd91411019f0e56b50b47f54d9d6ea0236f131 100644
--- a/src/Services/ParameterService.cpp
+++ b/src/Services/ParameterService.cpp
@@ -13,19 +13,17 @@ ParameterService::ParameterService() {
 void ParameterService::addNewParameter(uint16_t id, ParameterBase* param, const char* flags) {
 	if (paramsList.full()) {
 		ErrorHandler::reportInternalError(ErrorHandler::InternalErrorType::MapFull);
-		return;
 	}
 	else {
 		if (paramsList.find(id) == paramsList.end()) {
 			param->setFlags(flags);
 			paramsList.insert(std::make_pair(id, param));
-			return;
 		}
 		else {
 			ErrorHandler::reportInternalError(ErrorHandler::InternalErrorType::ExistingParameterId);
-			return;
 		}
 	}
+	return;
 }
 
 void ParameterService::reportParameterIds(Message& paramIds) {