diff --git a/src/Service.cpp b/src/Service.cpp
index e308a62c182d0f957f10889a1c67cde626e549f0..ab0d01391854473d6177d92ed2cee06cf7bb0112 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -26,6 +26,7 @@ void Service::execute(Message& message) {
 			break;
 		case 20:
 			Services.parameterManagement.execute(message); // ST[20]
+			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
 	}
diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp
index 710e8bb058f3a1f4a75287f362c186cd02de01ca..e82623086b0d2d357fc3dcb2a1f39e320b0d40fa 100644
--- a/src/Services/ParameterService.cpp
+++ b/src/Services/ParameterService.cpp
@@ -127,6 +127,7 @@ void ParameterService::execute(Message& message) {
 			break;
 		case 3:
 			setParameterIds(message); // TC[20,3]
+			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
 	}