diff --git a/fw/Core/Src/main.c b/fw/Core/Src/main.c
index 534c95a..aaf8352 100644
--- a/fw/Core/Src/main.c
+++ b/fw/Core/Src/main.c
@@ -257,11 +257,13 @@ int main(void)
 	  }
 	  /* if config changed (MODBUS write), reflect changes to EEPROM */
 	  if (sensor_config_pending_write) {
-//		  config_write(&sensor_config);
+		  config_write(&sensor_config);
+		  sensor_config_pending_write = 0;
 	  }
 	  if (modbus_address_changed)
 	  {
 		  modbus_slave_set_address(sensor_config.modbus_addr);
+		  modbus_address_changed = 0;
 	  }
 	  if (baudrate_changed)
 	  {
@@ -739,8 +741,6 @@ int8_t modbus_slave_callback(modbus_transaction_t *transaction)
 						return MODBUS_ERROR_FUNCTION_NOT_IMPLEMENTED;
 				}
 			}
-			/* TODO: Set modbus address on change */
-			/* TODO: Set UART baudrate on change */
 			sensor_config_pending_write = 1;
 			return MODBUS_OK;
 		default: