diff --git a/src/detect-engine.c b/src/detect-engine.c
index cff2e0d26d..7b1238f45c 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -128,10 +128,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
         { ALPROTO_DNS,
           DETECT_SM_LIST_DNSREQUEST_MATCH,
           DetectEngineInspectDnsRequest },
-        /* TLS */
-        { ALPROTO_TLS,
-          DETECT_SM_LIST_TLSSNI_MATCH,
-          DetectEngineInspectTlsSni },
         /* SMTP */
         { ALPROTO_SMTP,
           DETECT_SM_LIST_FILEMATCH,
diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index cdfb1e5087..ee455310d3 100644
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -76,6 +76,9 @@ void DetectTlsSniRegister(void)
             DETECT_SM_LIST_TLSSNI_MATCH, 2,
             PrefilterTxTlsSniRegister);
 
+    DetectAppLayerInspectEngineRegister(ALPROTO_TLS, SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_TLSSNI_MATCH,
+            DetectEngineInspectTlsSni);
 }