diff --git a/src/inputdevice.cpp b/src/inputdevice.cpp
index c1e9fdbbf..1d19dd4bd 100644
--- a/src/inputdevice.cpp
+++ b/src/inputdevice.cpp
@@ -5335,14 +5335,19 @@ static int handle_input_event2(int nr, int state, int max, int flags, int extra)
 		isaks = true;
 	}
 
+#ifdef DEBUGGER
 	if (isaks) {
 		if (debug_trainer_event(ie->data, state))
+		{
 			return 0;
+		}
 	} else {
 		if (debug_trainer_event(nr, state))
+		{
 			return 0;
+		}
 	}
-
+#endif
 	if (!isaks) {
 		if (input_record && input_record != INPREC_RECORD_PLAYING)
 			inprec_recordevent (nr, state, max, autofire);
diff --git a/src/osdep/amiberry_serial.cpp b/src/osdep/amiberry_serial.cpp
index e44ae73c2..f45734f47 100644
--- a/src/osdep/amiberry_serial.cpp
+++ b/src/osdep/amiberry_serial.cpp
@@ -1004,9 +1004,11 @@ static void serdatcopy(void)
 	}
 
 	if (serper == 372) {
+#ifdef ENFORCER
 		if (enforcermode & 2) {
 			console_out_f(_T("%c"), docharlog(serdatshift_masked));
 		}
+#endif
 	}
 
 	if (data_in_sershift == 0) {