diff --git a/src/components/PageComponents/ModuleConfig/CannedMessage.tsx b/src/components/PageComponents/ModuleConfig/CannedMessage.tsx
index bc3eb0a4..15788a5d 100644
--- a/src/components/PageComponents/ModuleConfig/CannedMessage.tsx
+++ b/src/components/PageComponents/ModuleConfig/CannedMessage.tsx
@@ -20,7 +20,7 @@ export const CannedMessage = (): JSX.Element => {
   return (
     <DynamicForm<CannedMessageValidation>
       onSubmit={onSubmit}
-      defaultValues={moduleConfig.mqtt}
+      defaultValues={moduleConfig.cannedMessage}
       fieldGroups={[
         {
           label: "Canned Message Settings",
diff --git a/src/components/PageComponents/ModuleConfig/RangeTest.tsx b/src/components/PageComponents/ModuleConfig/RangeTest.tsx
index 70f54bf3..3d5916bd 100644
--- a/src/components/PageComponents/ModuleConfig/RangeTest.tsx
+++ b/src/components/PageComponents/ModuleConfig/RangeTest.tsx
@@ -20,7 +20,7 @@ export const RangeTest = (): JSX.Element => {
   return (
     <DynamicForm<RangeTestValidation>
       onSubmit={onSubmit}
-      defaultValues={moduleConfig.mqtt}
+      defaultValues={moduleConfig.rangeTest}
       fieldGroups={[
         {
           label: "Range Test Settings",
diff --git a/src/components/PageComponents/ModuleConfig/StoreForward.tsx b/src/components/PageComponents/ModuleConfig/StoreForward.tsx
index 30bab377..8b80ecc0 100644
--- a/src/components/PageComponents/ModuleConfig/StoreForward.tsx
+++ b/src/components/PageComponents/ModuleConfig/StoreForward.tsx
@@ -20,7 +20,7 @@ export const StoreForward = (): JSX.Element => {
   return (
     <DynamicForm<StoreForwardValidation>
       onSubmit={onSubmit}
-      defaultValues={moduleConfig.mqtt}
+      defaultValues={moduleConfig.storeForward}
       fieldGroups={[
         {
           label: "Store & Forward Settings",