diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
index 07a2cfba29..dbe1ecd4ac 100644
--- a/firmware/CHANGELOG.md
+++ b/firmware/CHANGELOG.md
@@ -17,7 +17,7 @@ Release template (copy/paste this for new release):
  -   
 
 ### Fixed
- -   
+ - Enforce board configuration overrides more strictly #4614   
 
  -->
 
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 9625e35c16..ea6ec96c76 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -190,6 +190,8 @@ void TunerStudio::handleWriteChunkCommand(TsChannelBase* tsChannel, ts_response_
 		uint8_t * addr = (uint8_t *) (getWorkingPageAddr() + offset);
 		memcpy(addr, content, count);
 	}
+	// Force any board configuration options that humans shouldn't be able to change
+	setBoardConfigOverrides();
 
 	sendOkResponse(tsChannel, mode);
 }
@@ -240,6 +242,8 @@ void TunerStudio::handleWriteValueCommand(TsChannelBase* tsChannel, ts_response_
 	if (!rebootForPresetPending) {
 		getWorkingPageAddr()[offset] = value;
 	}
+	// Force any board configuration options that humans shouldn't be able to change
+	setBoardConfigOverrides();
 }
 
 void TunerStudio::handlePageReadCommand(TsChannelBase* tsChannel, ts_response_format_e mode, uint16_t offset, uint16_t count) {
diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
index 5ce4a2798e..19f06269b3 100644
--- a/simulator/simulator/rusEfiFunctionalTest.cpp
+++ b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -181,3 +181,6 @@ CANDriver* detectCanDevice(brain_pin_e pinRx, brain_pin_e pinTx) {
 	return &CAND1;
 }
 #endif // HAL_USE_CAN
+
+void setBoardConfigOverrides() {
+}
diff --git a/unit_tests/global_mocks.cpp b/unit_tests/global_mocks.cpp
index 594633015d..c8631e7052 100644
--- a/unit_tests/global_mocks.cpp
+++ b/unit_tests/global_mocks.cpp
@@ -25,3 +25,7 @@ efitick_t getTimeNowNt() {
 
 void initLogging(LoggingWithStorage *logging, const char *name) {
 }
+
+void setBoardConfigOverrides() {
+}
+