diff --git a/changelog/@unreleased/pr-2383.v2.yml b/changelog/@unreleased/pr-2383.v2.yml
new file mode 100644
index 000000000..16364a842
--- /dev/null
+++ b/changelog/@unreleased/pr-2383.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: The `CyclomaticComplexity` check is now configured with `switchBlockAsSingleDecisionPoint`.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2383
diff --git a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
index 6803583ad..bc866b495 100644
--- a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
+++ b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
@@ -420,7 +420,9 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+            <property name="switchBlockAsSingleDecisionPoint">true</property>
+        </module>
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
             <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>