diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 67ec7aba9b..deb292dd1f 100644
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -222,6 +222,7 @@ void DetectDnsQueryRegister (void)
 
     DetectBufferTypeSetDescriptionByName("dns_query",
             "dns request query");
+    DetectBufferTypeSupportsMultiInstance("dns_query");
 
     g_dns_query_buffer_id = DetectBufferTypeGetByName("dns_query");
 
diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index c81e5bb650..ffe5da488a 100644
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -159,6 +159,7 @@ void DetectFiledataRegister(void)
             "file_data", ALPROTO_FTP, SIG_FLAG_TOCLIENT, 0, DetectEngineInspectFiledata, NULL);
 
     DetectBufferTypeSetDescriptionByName("file_data", "data from tracked files");
+    DetectBufferTypeSupportsMultiInstance("file_data");
 
     g_file_data_buffer_id = DetectBufferTypeGetByName("file_data");
 }
diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index e68d659d64..803ff76dce 100644
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -162,6 +162,7 @@ void DetectFilemagicRegister(void)
 
     DetectBufferTypeSetDescriptionByName("file.magic",
             "file magic");
+    DetectBufferTypeSupportsMultiInstance("file.magic");
 
     g_file_magic_buffer_id = DetectBufferTypeGetByName("file.magic");
 	SCLogDebug("registering filemagic rule option");
diff --git a/src/detect-filename.c b/src/detect-filename.c
index e38754f7d3..a20666a3d9 100644
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -160,6 +160,7 @@ void DetectFilenameRegister(void)
     }
 
     DetectBufferTypeSetDescriptionByName("file.name", "file name");
+    DetectBufferTypeSupportsMultiInstance("file.name");
 
     g_file_name_buffer_id = DetectBufferTypeGetByName("file.name");
 	SCLogDebug("registering filename rule option");
diff --git a/src/detect-http2.c b/src/detect-http2.c
index 7006145031..f55db43e6f 100644
--- a/src/detect-http2.c
+++ b/src/detect-http2.c
@@ -201,7 +201,7 @@ void DetectHttp2Register(void)
     DetectAppLayerInspectEngineRegister2("http2_header_name",
                                          ALPROTO_HTTP2, SIG_FLAG_TOSERVER, HTTP2StateOpen,
                                          DetectEngineInspectHttp2HeaderName, NULL);
-
+    DetectBufferTypeSupportsMultiInstance("http2_header_name");
     DetectBufferTypeSetDescriptionByName("http2_header_name",
                                          "HTTP2 header name");
     g_http2_header_name_buffer_id = DetectBufferTypeGetByName("http2_header_name");
@@ -211,6 +211,7 @@ void DetectHttp2Register(void)
     sigmatch_table[DETECT_HTTP2_HEADER].url = "/rules/http2-keywords.html#header";
     sigmatch_table[DETECT_HTTP2_HEADER].Setup = DetectHTTP2headerSetup;
     sigmatch_table[DETECT_HTTP2_HEADER].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
+    DetectBufferTypeSupportsMultiInstance("http2_header");
 
     DetectAppLayerMpmRegister2("http2_header", SIG_FLAG_TOCLIENT, 2,
                                PrefilterMpmHttp2HeaderRegister, NULL,
diff --git a/src/detect-ike-vendor.c b/src/detect-ike-vendor.c
index edefc43822..65e7c60d06 100644
--- a/src/detect-ike-vendor.c
+++ b/src/detect-ike-vendor.c
@@ -189,6 +189,8 @@ void DetectIkeVendorRegister(void)
             "ike.vendor", ALPROTO_IKE, SIG_FLAG_TOSERVER, 1, DetectEngineInspectIkeVendor, NULL);
 
     g_ike_vendor_buffer_id = DetectBufferTypeGetByName("ike.vendor");
+
+    DetectBufferTypeSupportsMultiInstance("ike.vendor");
 }
 
 /**
diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c
index 257f3ed071..239ab3aa9a 100644
--- a/src/detect-krb5-cname.c
+++ b/src/detect-krb5-cname.c
@@ -209,4 +209,6 @@ void DetectKrb5CNameRegister(void)
             "Kerberos 5 ticket client name");
 
     g_krb5_cname_buffer_id = DetectBufferTypeGetByName("krb5_cname");
+
+    DetectBufferTypeSupportsMultiInstance("krb5_cname");
 }
diff --git a/src/detect-krb5-sname.c b/src/detect-krb5-sname.c
index 79c08f38a9..a37ff7a3bd 100644
--- a/src/detect-krb5-sname.c
+++ b/src/detect-krb5-sname.c
@@ -209,4 +209,6 @@ void DetectKrb5SNameRegister(void)
             "Kerberos 5 ticket server name");
 
     g_krb5_sname_buffer_id = DetectBufferTypeGetByName("krb5_sname");
+
+    DetectBufferTypeSupportsMultiInstance("krb5_sname");
 }
diff --git a/src/detect-mqtt-subscribe-topic.c b/src/detect-mqtt-subscribe-topic.c
index 24c601c6e2..107190f796 100644
--- a/src/detect-mqtt-subscribe-topic.c
+++ b/src/detect-mqtt-subscribe-topic.c
@@ -224,6 +224,8 @@ void DetectMQTTSubscribeTopicRegister (void)
             "subscribe topic query");
 
     g_mqtt_subscribe_topic_buffer_id = DetectBufferTypeGetByName("mqtt.subscribe.topic");
+
+    DetectBufferTypeSupportsMultiInstance("mqtt.subscribe.topic");
 }
 
 /**
diff --git a/src/detect-mqtt-unsubscribe-topic.c b/src/detect-mqtt-unsubscribe-topic.c
index d349971bee..cbd5a84e02 100644
--- a/src/detect-mqtt-unsubscribe-topic.c
+++ b/src/detect-mqtt-unsubscribe-topic.c
@@ -224,6 +224,8 @@ void DetectMQTTUnsubscribeTopicRegister (void)
             "unsubscribe topic query");
 
     g_mqtt_unsubscribe_topic_buffer_id = DetectBufferTypeGetByName("mqtt.unsubscribe.topic");
+
+    DetectBufferTypeSupportsMultiInstance("mqtt.unsubscribe.topic");
 }
 
 /**
diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c
index 91e58eb543..b83e192e7d 100644
--- a/src/detect-quic-cyu-hash.c
+++ b/src/detect-quic-cyu-hash.c
@@ -245,6 +245,8 @@ void DetectQuicCyuHashRegister(void)
     g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
 
     DetectBufferTypeRegisterValidateCallback(BUFFER_NAME, DetectQuicHashValidateCallback);
+
+    DetectBufferTypeSupportsMultiInstance(BUFFER_NAME);
 }
 
 #ifdef UNITTESTS
diff --git a/src/detect-quic-cyu-string.c b/src/detect-quic-cyu-string.c
index d1ec757b21..08848ca00f 100644
--- a/src/detect-quic-cyu-string.c
+++ b/src/detect-quic-cyu-string.c
@@ -197,6 +197,8 @@ void DetectQuicCyuStringRegister(void)
 
     g_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME);
 
+    DetectBufferTypeSupportsMultiInstance(BUFFER_NAME);
+
     SCLogDebug("registering " BUFFER_NAME " rule option");
 }
 
diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 282ecd10e1..9ec7fb96fb 100644
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -92,6 +92,8 @@ void DetectTlsSubjectRegister(void)
             PrefilterGenericMpmRegister, GetData, ALPROTO_TLS,
             TLS_STATE_CERT_READY);
 
+    DetectBufferTypeSupportsMultiInstance("tls.cert_subject");
+
     DetectBufferTypeSetDescriptionByName("tls.cert_subject",
             "TLS certificate subject");
 
diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c
index a5e7a11cea..02b35ba1e6 100644
--- a/src/detect-tls-certs.c
+++ b/src/detect-tls-certs.c
@@ -110,6 +110,8 @@ void DetectTlsCertsRegister(void)
 
     DetectBufferTypeSetDescriptionByName("tls.certs", "TLS certificate");
 
+    DetectBufferTypeSupportsMultiInstance("tls.certs");
+
     g_tls_certs_buffer_id = DetectBufferTypeGetByName("tls.certs");
 }