diff --git a/etc/spdk/iscsi.conf.in b/etc/spdk/iscsi.conf.in
index 2f725dc13..1ebee8ed4 100644
--- a/etc/spdk/iscsi.conf.in
+++ b/etc/spdk/iscsi.conf.in
@@ -26,7 +26,7 @@
 
   # Tracepoint group mask for spdk trace buffers
   # Default: 0x0 (all tracepoint groups disabled)
-  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.
+  # Set to 0xFFFF to enable all tracepoint groups.
   #TpointGroupMask 0x0
 
 # Users may activate entries in this section to override default values for
diff --git a/etc/spdk/nvmf.conf.in b/etc/spdk/nvmf.conf.in
index 66ca5a0cd..0faf1a41d 100644
--- a/etc/spdk/nvmf.conf.in
+++ b/etc/spdk/nvmf.conf.in
@@ -17,7 +17,7 @@
 
   # Tracepoint group mask for spdk trace buffers
   # Default: 0x0 (all tracepoint groups disabled)
-  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.
+  # Set to 0xFFFF to enable all tracepoint groups.
   #TpointGroupMask 0x0
 
   # PciBlacklist and PciWhitelist cannot be used at the same time
diff --git a/etc/spdk/vhost.conf.in b/etc/spdk/vhost.conf.in
index 1605749d5..e4dbd80a8 100644
--- a/etc/spdk/vhost.conf.in
+++ b/etc/spdk/vhost.conf.in
@@ -26,7 +26,7 @@
 
   # Tracepoint group mask for spdk trace buffers
   # Default: 0x0 (all tracepoint groups disabled)
-  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.
+  # Set to 0xFFFF to enable all tracepoint groups.
   #TpointGroupMask 0x0
 
 # Users may activate entries in this section to override default values for
diff --git a/lib/event/app.c b/lib/event/app.c
index a8dd3c782..84d7b7d4a 100644
--- a/lib/event/app.c
+++ b/lib/event/app.c
@@ -141,7 +141,7 @@ static char g_cmdline_short_opts[2 * SPDK_APP_MAX_CMDLINE_OPTIONS + 1];
 "\n" \
 "  # Tracepoint group mask for spdk trace buffers\n" \
 "  # Default: 0x0 (all tracepoint groups disabled)\n" \
-"  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.\n" \
+"  # Set to 0xFFFF to enable all tracepoint groups.\n" \
 "  TpointGroupMask \"0x%" PRIX64 "\"\n" \
 "\n" \
 
diff --git a/lib/trace/trace_flags.c b/lib/trace/trace_flags.c
index 720845643..2f6236cdc 100644
--- a/lib/trace/trace_flags.c
+++ b/lib/trace/trace_flags.c
@@ -93,7 +93,7 @@ spdk_trace_set_tpoint_group_mask(uint64_t tpoint_group_mask)
 {
 	int i;
 
-	for (i = 0; i < 64; i++) {
+	for (i = 0; i < SPDK_TRACE_MAX_GROUP_ID; i++) {
 		if (tpoint_group_mask & (1ULL << i)) {
 			spdk_trace_set_tpoints(i, -1ULL);
 		}