diff --git a/src/graphql/query/checkout/initializeCheckout.graphql b/src/graphql/query/checkout/initializeCheckout.graphql
index 21775cc7a1..11183e0815 100644
--- a/src/graphql/query/checkout/initializeCheckout.graphql
+++ b/src/graphql/query/checkout/initializeCheckout.graphql
@@ -38,11 +38,11 @@ query initializeCheckout($basketId: String) {
 			key
 			value
 		}
-		ftd_amount: uiConfigSetting(key: "ftd_message_amount") {
+		ftd_message_amount: uiConfigSetting(key: "ftd_message_amount") {
 			key
 			value
 		}
-		ftd_date_time: uiConfigSetting(key: "ftd_message_valid_date") {
+		ftd_message_valid_date: uiConfigSetting(key: "ftd_message_valid_date") {
 			key
 			value
 		}
diff --git a/src/graphql/query/thanksPage.graphql b/src/graphql/query/thanksPage.graphql
index 1123bee1c4..852a58e370 100644
--- a/src/graphql/query/thanksPage.graphql
+++ b/src/graphql/query/thanksPage.graphql
@@ -136,7 +136,7 @@ query checkoutReceipt($checkoutId: Int!, $visitorId: String) {
 			key
 			value
 		}
-		ftd_amount: uiConfigSetting(key: "ftd_message_amount") {
+		ftd_message_amount: uiConfigSetting(key: "ftd_message_amount") {
 			key
 			value
 		}
diff --git a/src/pages/Checkout/CheckoutPage.vue b/src/pages/Checkout/CheckoutPage.vue
index 4336e6c108..bef5a8b2fe 100644
--- a/src/pages/Checkout/CheckoutPage.vue
+++ b/src/pages/Checkout/CheckoutPage.vue
@@ -497,8 +497,8 @@ export default {
 			this.lenderTotalLoans = data?.my?.loans?.totalCount ?? 0;
 			// Enable FTDs message from settings
 			this.isFtdMessageEnable = readBoolSetting(data, 'general.ftd_message_enable.value');
-			this.ftdCreditAmount = data?.general?.ftd_amount?.value ?? '';
-			this.ftdValidDate = data?.general?.ftd_date?.value ?? '';
+			this.ftdCreditAmount = data?.general?.ftd_message_amount?.value ?? '';
+			this.ftdValidDate = data?.general?.ftd_message_valid_date?.value ?? '';
 		}
 	},
 	beforeRouteEnter(to, from, next) {
diff --git a/src/pages/Thanks/ThanksPage.vue b/src/pages/Thanks/ThanksPage.vue
index 3013f8b47f..e6fec60620 100644
--- a/src/pages/Thanks/ThanksPage.vue
+++ b/src/pages/Thanks/ThanksPage.vue
@@ -296,7 +296,7 @@ export default {
 		// Enable FTDs message from settings
 		this.isFtdMessageEnable = readBoolSetting(data, 'general.ftd_message_enable.value');
 		// Credit amount for FTD message from settings
-		const ftdCreditAmountData = data?.general?.ftd_amount ?? null;
+		const ftdCreditAmountData = data?.general?.ftd_message_amount ?? null;
 		this.ftdCreditAmount = ftdCreditAmountData ? ftdCreditAmountData.value : '';
 
 		const loansResponse = this.receipt?.items?.values ?? [];