diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 17d76423..9c3525c5 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -476,8 +476,10 @@ netconf_input_cb(int   s,
             cbmsg = NULL;
             break;
         }
-        clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg));
-        clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg));
+        if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg));
+        else
+            clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg));
         if ((ret = netconf_input_frame2(cbmsg, YB_RPC, yspec, &xtop, &xerr)) < 0)
             goto done;
         cbuf_reset(cbmsg);
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index e7ce5236..37454f49 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -2203,8 +2203,10 @@ netconf_output(int   s,
     char *buf = cbuf_get(cb);
     int   len = cbuf_len(cb);
 
-    clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb));
-    clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb));
+    if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+        clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb));
+    else
+        clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb));
 #if 0 // Extra sanity check for debugging
     {
         cxobj *xt = NULL;
diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c
index 97d072cd..d28ef951 100644
--- a/lib/src/clixon_proto.c
+++ b/lib/src/clixon_proto.c
@@ -354,12 +354,16 @@ clixon_msg_send(int         s,
     int retval = -1;
 
     if (descr){
-        clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb));
-        clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb));
+        if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb));
+        else
+            clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb));
     }
     else{
-        clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb));
-        clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb));
+        if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb));
+        else
+            clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb));
     }
 
     if (atomicio((ssize_t (*)(int, void *, size_t))write,
@@ -433,12 +437,16 @@ clixon_msg_rcv10(int         s,
     }
     else {
         if (descr){
-            clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb));
-            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb));
+            if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+                clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb));
+            else
+                clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb));
         }
         else{
-            clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb));
-            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb));
+            if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+                clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb));
+            else
+                clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb));
         }
 
     }
@@ -612,12 +620,17 @@ clixon_msg_rcv11(int         s,
     }
     else {
         if (descr){
-            clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg));
-            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg));
+            if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+                clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg));
+            else
+                clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg));
         }
         else{
-            clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg));
-            clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg));
+            if (clixon_debug_isset(CLIXON_DBG_DETAIL))
+                clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg));
+            else
+                clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg));
+
         }
 
     }