diff --git a/ci/.clang-tidy b/ci/.clang-tidy
index d6611e01ed1e46f65632ddbbfa2814514c8367c8..38beddf8e90c12aa96ede94f6d80bf27cc253aef 100644
--- a/ci/.clang-tidy
+++ b/ci/.clang-tidy
@@ -19,7 +19,7 @@ Checks:          >
   performance-*,
   readability-*,
   zircon-*
-WarningsAsErrors: '*,-misc-unused-parameters,-llvm-header-guard,-cppcoreguidelines-pro-type-member-init,-google-runtime-references,-clang-diagnostic-tautological-constant-out-of-range-compare,-readability-redundant-declaration',-modernize-use-equals-default,-fuchsia-statically-constructed-objects,-hicpp-signed-bitwise,-cert-err58-cpp',-clang-diagnostic-error,-misc-noexcept-move-constructor'
+WarningsAsErrors: '*,-misc-unused-parameters,-llvm-header-guard,-cppcoreguidelines-pro-type-member-init,-google-runtime-references,-clang-diagnostic-tautological-constant-out-of-range-compare,-readability-redundant-declaration,-modernize-use-equals-default,-fuchsia-statically-constructed-objects,-hicpp-signed-bitwise,-cert-err58-cpp,-clang-diagnostic-error,-misc-noexcept-move-constructor'
 HeaderFilterRegex: 'ecss-services\/((?!lib\/).)*$'
 AnalyzeTemporaryDtors: false
 ...
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 92d7055d9d8cc09d71a50030a2116f133fd959ef..e33ff714f803a6e150980559ae2f6b7130ee2512 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -191,8 +191,7 @@ void EventActionService::executeAction(uint16_t eventID) {
 	if (eventActionFunctionStatus) {
 		for (uint16_t i = 0; i < ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE; i++) {
 			if (not eventActionDefinitionArray[i].empty &&
-			    eventActionDefinitionArray[i].enabled ==
-			    true) {
+			    eventActionDefinitionArray[i].enabled) {
 				if (eventActionDefinitionArray[i].eventDefinitionID == eventID) {
 					MessageParser messageParser;
 					Message message = messageParser.parseRequestTC(
diff --git a/src/Services/EventReportService.cpp b/src/Services/EventReportService.cpp
index 162b4b2349e6f5a14f264d1cf5a027580282c960..b86a017c6c808b9121b9c85159c25904057af655 100644
--- a/src/Services/EventReportService.cpp
+++ b/src/Services/EventReportService.cpp
@@ -125,7 +125,7 @@ void EventReportService::listOfDisabledEventsReport() {
 	uint16_t numberOfDisabledEvents = stateOfEvents.size() - stateOfEvents.count();
 	report.appendHalfword(numberOfDisabledEvents);
 	for (uint16_t i = 0; i < stateOfEvents.size(); i++) {
-		if (stateOfEvents[i] == 0) {
+		if (not stateOfEvents[i]) {
 			report.appendEnum16(i);
 		}
 	}