diff --git a/src/ucs/config/global_opts.c b/src/ucs/config/global_opts.c
index cbae01f2e0c..0fb6cd7b894 100644
--- a/src/ucs/config/global_opts.c
+++ b/src/ucs/config/global_opts.c
@@ -85,7 +85,12 @@ static ucs_config_field_t ucs_global_opts_table[] = {
   ucs_offsetof(ucs_global_opts_t, mpool_fifo), UCS_CONFIG_TYPE_BOOL},
 #endif
 
- {"HANDLE_ERRORS", "bt",
+ {"HANDLE_ERRORS",
+#if ENABLE_DEBUG_DATA
+  "bt,freeze",
+#else
+  "bt",
+#endif
   "Error handling mode. A combination of: 'bt' (print backtrace),\n"
   "'freeze' (freeze and wait for a debugger), 'debug' (attach debugger)",
   ucs_offsetof(ucs_global_opts_t, handle_errors),