diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java
index 7a1781d13..33ea73989 100644
--- a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java
+++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java
@@ -83,7 +83,26 @@ public void shouldMapDaprClientProperties() {
       });
 
     });
+  }
 
+  @Test
+  @DisplayName("Should map DaprClient properties correctly (camelCase)")
+  public void shouldMapDaprClientPropertiesCamelCase() {
+    runner.withSystemProperties(
+            "dapr.client.httpEndpoint=http://localhost",
+            "dapr.client.httpPort=3500",
+            "dapr.client.grpcEndpoint=localhost",
+            "dapr.client.grpcPort=50001"
+    ).run(context -> {
+      DaprClientProperties properties = context.getBean(DaprClientProperties.class);
+      SoftAssertions.assertSoftly(softly -> {
+        softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost");
+        softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost");
+        softly.assertThat(properties.getHttpPort()).isEqualTo(3500);
+        softly.assertThat(properties.getGrpcPort()).isEqualTo(50001);
+      });
+
+    });
   }
 
   @EnableConfigurationProperties(DaprClientProperties.class)
diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
index b530d06cd..270d9899b 100644
--- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
+++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
@@ -56,13 +56,13 @@ This will connect to the default Dapr gRPC endpoint `localhost:50001`, requiring
 {{% alert title="Note" color="primary" %}}
 By default, the following properties are preconfigured for `DaprClient` and `DaprWorkflowClient`:
 ```properties
-dapr.client.http-endpoint=http://localhost
-dapr.client.http-port=3500
-dapr.client.grpc-endpoint=localhost
-dapr.client.grpc-port=50001
-dapr.client.api-token=<Your Remote App API Token>
+dapr.client.httpEndpoint=http://localhost
+dapr.client.httpPort=3500
+dapr.client.grpcEndpoint=localhost
+dapr.client.grpcPort=50001
+dapr.client.apiToken=<your remote api token>
 ```
-These values are used by default, but you can override them in your `application.properties` file to suit your environment.
+These values are used by default, but you can override them in your `application.properties` file to suit your environment. Please note that both kebab case and camel case are supported.
 {{% /alert %}}
 
 You can use the `DaprClient` to interact with the Dapr APIs anywhere in your application, for example from inside a REST endpoint: