diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx
index 9653a2cb..b5343487 100644
--- a/src/components/PageComponents/ModuleConfig/MQTT.tsx
+++ b/src/components/PageComponents/ModuleConfig/MQTT.tsx
@@ -11,7 +11,10 @@ export const MQTT = (): JSX.Element => {
       new Protobuf.ModuleConfig.ModuleConfig({
         payloadVariant: {
           case: "mqtt",
-          value: data,
+          value: {
+            ...data,
+            mapReportSettings: new Protobuf.ModuleConfig.ModuleConfig_MapReportSettings(data.mapReportSettings)
+          },
         },
       }),
     );
diff --git a/src/validation/moduleConfig/mqtt.ts b/src/validation/moduleConfig/mqtt.ts
index d018f5b9..fbeef623 100644
--- a/src/validation/moduleConfig/mqtt.ts
+++ b/src/validation/moduleConfig/mqtt.ts
@@ -46,11 +46,11 @@ export class MqttValidationMapReportSettings
   implements
     Omit<Protobuf.ModuleConfig.ModuleConfig_MapReportSettings, keyof Message>
 {
-  @IsOptional()
   @IsNumber()
+  @IsOptional()
   publishIntervalSecs: number;
 
-  @IsOptional()
   @IsNumber()
+  @IsOptional()
   positionPrecision: number;
 }