diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c
index 41b8a80533510fabc11f9a2960c593cbbdff43f0..b5d4da3e289976f848113c02a6d1b642e837ea8b 100644
--- a/lnet/libcfs/linux/linux-debug.c
+++ b/lnet/libcfs/linux/linux-debug.c
@@ -193,7 +193,8 @@ void lbug_with_loc(const char *file, const char *func, const int line)
         }
 
         libcfs_debug_dumpstack(NULL);
-        libcfs_debug_dumplog();
+        if (!libcfs_panic_on_lbug)
+                libcfs_debug_dumplog();
         libcfs_run_lbug_upcall(file, func, line);
         if (libcfs_panic_on_lbug)
                 panic("LBUG");