diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c
index 96583661eb..5dc966e69c 100644
--- a/asn1/atn-cm/packet-atn-cm-template.c
+++ b/asn1/atn-cm/packet-atn-cm-template.c
@@ -104,7 +104,7 @@ dissect_atn_cm_heur(
     proto_tree *tree,
     void *data _U_)
 {
-    atn_conversation_t *atn_cv = NULL;
+    atn_conversation_t *volatile atn_cv = NULL;
     volatile gboolean is_atn_cm = FALSE;
     int type;
 
diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
index e52b357f74..500dd3d511 100644
--- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
+++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
@@ -214,7 +214,7 @@ dissect_atn_cpdlc_heur(
     proto_tree *tree,
     void *data _U_)
 {
-    atn_conversation_t *atn_cv = NULL;
+    atn_conversation_t *volatile atn_cv = NULL;
     volatile gboolean is_atn_cpdlc = FALSE;
     volatile gboolean is_pm = FALSE;
     int type;
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index 659b7ff1cf..23a503da83 100644
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -677,7 +677,7 @@ dissect_atn_cm_heur(
     proto_tree *tree,
     void *data _U_)
 {
-    atn_conversation_t *atn_cv = NULL;
+    atn_conversation_t *volatile atn_cv = NULL;
     volatile gboolean is_atn_cm = FALSE;
     int type;
 
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c
index 81f7fac119..ad2517579c 100644
--- a/epan/dissectors/packet-atn-cpdlc.c
+++ b/epan/dissectors/packet-atn-cpdlc.c
@@ -5423,7 +5423,7 @@ dissect_atn_cpdlc_heur(
     proto_tree *tree,
     void *data _U_)
 {
-    atn_conversation_t *atn_cv = NULL;
+    atn_conversation_t *volatile atn_cv = NULL;
     volatile gboolean is_atn_cpdlc = FALSE;
     volatile gboolean is_pm = FALSE;
     int type;