diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 66aa79035c..6644e1b62e 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -47,6 +47,10 @@ server:
         key_alias: "${SSL_KEY_ALIAS:tomcat}"
         # Password used to access the key
         key_password: "${SSL_KEY_PASSWORD:thingsboard}"
+  # HTTP/2 support (takes effect only if server SSL is enabled)
+  http2:
+    # Enable/disable HTTP/2 support
+    enabled: "${HTTP2_ENABLED:true}"
   log_controller_error_stack_trace: "${HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE:false}"
   ws:
     send_timeout: "${TB_SERVER_WS_SEND_TIMEOUT:5000}"
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index 603698c2df..17d86b0ea6 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -47,6 +47,10 @@ server:
         key_alias: "${SSL_KEY_ALIAS:tomcat}"
         # Password used to access the key
         key_password: "${SSL_KEY_PASSWORD:thingsboard}"
+  # HTTP/2 support (takes effect only if server SSL is enabled)
+  http2:
+    # Enable/disable HTTP/2 support
+    enabled: "${HTTP2_ENABLED:true}"
 
 # Zookeeper connection parameters. Used for service discovery.
 zk: