diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index e62a2d7291..fea52ac901 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -119,10 +119,8 @@ void Game_Interpreter::Push(
 	frame.current_command = 0;
 	frame.triggered_by_decision_key = started_by_decision_key;
 	frame.event_id = event_id;
-	if (Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) {
-		frame.maniac_event_id = event_id;
-		frame.maniac_event_page_id = event_page_id;
-	}
+	frame.maniac_event_id = event_id;
+	frame.maniac_event_page_id = event_page_id;
 
 	if (_state.stack.empty() && main_flag && !Game_Battle::IsBattleRunning()) {
 		Main_Data::game_system->ClearMessageFace();
diff --git a/src/window_interpreter.cpp b/src/window_interpreter.cpp
index 350ed3f152..338eb6f811 100644
--- a/src/window_interpreter.cpp
+++ b/src/window_interpreter.cpp
@@ -58,7 +58,7 @@ void Window_Interpreter::Refresh() {
 	for (int i = state.stack.size() - 1; i >= 0; i--) {
 		int evt_id = state.stack[i].event_id;
 		int page_id = 0;
-		if ((Player::IsPatchManiac() || Player::HasEasyRpgExtensions()) && state.stack[i].maniac_event_id > 0) {
+		if (state.stack[i].maniac_event_id > 0) {
 			evt_id = state.stack[i].maniac_event_id;
 			page_id = state.stack[i].maniac_event_page_id;
 		}