diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TlsSessionInfo.java b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TlsSessionInfo.java
index 8f55693428..5cd079f9e0 100644
--- a/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TlsSessionInfo.java
+++ b/akka-http-core/src/main/java/akka/http/javadsl/model/headers/TlsSessionInfo.java
@@ -4,6 +4,8 @@
 
 package akka.http.javadsl.model.headers;
 
+import akka.http.scaladsl.model.HttpHeader;
+
 import javax.net.ssl.SSLSession;
 
 /**
@@ -13,7 +15,7 @@
  * This header will only be added if it enabled in the configuration by setting
  * <code>akka.http.[client|server].parsing.tls-session-info-header = on</code>.
  */
-public abstract class TlsSessionInfo extends CustomHeader {
+public abstract class TlsSessionInfo extends HttpHeader {
     /**
      * @return the SSLSession this message was received over.
      */
diff --git a/akka-http-core/src/main/mima-filters/10.6.3.backwards.excludes/tls-session-info.excludes b/akka-http-core/src/main/mima-filters/10.6.3.backwards.excludes/tls-session-info.excludes
new file mode 100644
index 0000000000..ba300d1d69
--- /dev/null
+++ b/akka-http-core/src/main/mima-filters/10.6.3.backwards.excludes/tls-session-info.excludes
@@ -0,0 +1,3 @@
+# changed type hierarchy but should not affect users
+ProblemFilters.exclude[MissingTypesProblem]("akka.http.javadsl.model.headers.TlsSessionInfo")
+ProblemFilters.exclude[MissingTypesProblem]("akka.http.scaladsl.model.headers.Tls$minusSession$minusInfo")
\ No newline at end of file