diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpaySettingsController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpaySettingsController.kt
index 876dcdb..2605c09 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpaySettingsController.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpaySettingsController.kt
@@ -39,8 +39,8 @@ class RazorpaySettingsController(
             RazorpaySettingsResponse(
                 propertyId = propertyId,
                 configured = false,
-                keyId = null,
                 isTest = false,
+                hasKeyId = false,
                 hasKeySecret = false,
                 hasWebhookSecret = false
             )
@@ -95,8 +95,8 @@ private fun RazorpaySettings.toResponse(): RazorpaySettingsResponse {
     return RazorpaySettingsResponse(
         propertyId = property.id!!,
         configured = true,
-        keyId = keyId,
         isTest = isTest,
+        hasKeyId = keyId.isNotBlank(),
         hasKeySecret = keySecret.isNotBlank(),
         hasWebhookSecret = !webhookSecret.isNullOrBlank()
     )
diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RazorpayDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RazorpayDtos.kt
index 406ffb2..98709a6 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/RazorpayDtos.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/RazorpayDtos.kt
@@ -17,8 +17,8 @@ data class RazorpaySettingsUpsertRequest(
 data class RazorpaySettingsResponse(
     val propertyId: UUID,
     val configured: Boolean,
-    val keyId: String?,
     val isTest: Boolean,
+    val hasKeyId: Boolean,
     val hasKeySecret: Boolean,
     val hasWebhookSecret: Boolean
 )