diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index 067a1e98c6..8154b4fd9e 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -116,6 +116,8 @@ public class SwaggerConfiguration {
     private String appVersion;
     @Value("${swagger.group_name:thingsboard}")
     private String groupName;
+    @Value("${swagger.doc_expansion:none}")
+    private String docExpansion;
 
     @Bean
     public OpenAPI thingsboardApi() {
@@ -172,7 +174,7 @@ public class SwaggerConfiguration {
         uiProperties.setDefaultModelExpandDepth(1);
         uiProperties.setDefaultModelRendering("example");
         uiProperties.setDisplayRequestDuration(false);
-        uiProperties.setDocExpansion("list");
+        uiProperties.setDocExpansion(docExpansion);
         uiProperties.setFilter("false");
         uiProperties.setMaxDisplayedTags(null);
         uiProperties.setOperationsSorter("alpha");
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 54c1442ea7..4ebb6881b0 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -1534,6 +1534,8 @@ swagger:
   version: "${SWAGGER_VERSION:}"
   # The group name (definition) on the API doc UI page.
   group_name: "${SWAGGER_GROUP_NAME:thingsboard}"
+  # Control the initial display state of API operations and tags (none, list or full)
+  doc_expansion: "${SWAGGER_DOC_EXPANSION:none}"
 
 # Queue configuration parameters
 queue: