diff --git a/events/EventManager.cpp b/events/EventManager.cpp
index f60a8a66..d171b591 100644
--- a/events/EventManager.cpp
+++ b/events/EventManager.cpp
@@ -42,7 +42,7 @@ ReturnValue_t EventManager::performOperation(uint8_t opCode) {
 		EventMessage message;
 		result = eventReportQueue->receiveMessage(&message);
 		if (result == HasReturnvaluesIF::RETURN_OK) {
-#ifdef DEBUG
+#if FSFW_DEBUG_OUTPUT == 1
 			printEvent(&message);
 #endif
 			notifyListeners(&message);
@@ -113,7 +113,7 @@ ReturnValue_t EventManager::unsubscribeFromEventRange(MessageQueueId_t listener,
 	return result;
 }
 
-#ifdef DEBUG
+#if FSFW_DEBUG_OUTPUT == 1
 
 void EventManager::printEvent(EventMessage* message) {
 	const char *string = 0;
diff --git a/events/EventManager.h b/events/EventManager.h
index 2602aeb2..5e1a8153 100644
--- a/events/EventManager.h
+++ b/events/EventManager.h
@@ -55,7 +55,7 @@ protected:
 
 	void notifyListeners(EventMessage *message);
 
-#ifdef DEBUG
+#if FSFW_DEBUG_OUTPUT == 1
 	void printEvent(EventMessage *message);
 #endif