diff --git a/cpukit/libtrace/record/record-dump-fatal.c b/cpukit/libtrace/record/record-dump-fatal.c
index 2f9a363f84..6e6bfae7bd 100644
--- a/cpukit/libtrace/record/record-dump-fatal.c
+++ b/cpukit/libtrace/record/record-dump-fatal.c
@@ -89,7 +89,7 @@ void _Record_Fatal_dump_base64(
   _SMP_Request_shutdown();
 #endif
 
-  _ISR_lock_Acquire( &_Record_Dump_base64_lock, &lock_context );
+  _ISR_lock_ISR_disable_and_acquire( &_Record_Dump_base64_lock, &lock_context );
 
   if ( !_Record_Dump_base64_done ) {
     _Record_Dump_base64_done = true;
@@ -99,5 +99,5 @@ void _Record_Fatal_dump_base64(
     printk( "\n*** END OF RECORDS BASE64 ***\n" );
   }
 
-  _ISR_lock_Release( &_Record_Dump_base64_lock, &lock_context );
+  _ISR_lock_Release_and_ISR_enable( &_Record_Dump_base64_lock, &lock_context );
 }
diff --git a/cpukit/libtrace/record/record-dump-zfatal.c b/cpukit/libtrace/record/record-dump-zfatal.c
index bb0db7f656..06ddd1cd32 100644
--- a/cpukit/libtrace/record/record-dump-zfatal.c
+++ b/cpukit/libtrace/record/record-dump-zfatal.c
@@ -91,7 +91,7 @@ void _Record_Fatal_dump_base64_zlib(
   _SMP_Request_shutdown();
 #endif
 
-  _ISR_lock_Acquire( &_Record_Dump_base64_zlib_lock, &lock_context );
+  _ISR_lock_ISR_disable_and_acquire( &_Record_Dump_base64_zlib_lock, &lock_context );
 
   if ( !_Record_Dump_base64_zlib_done ) {
     _Record_Dump_base64_zlib_done = true;
@@ -105,5 +105,5 @@ void _Record_Fatal_dump_base64_zlib(
     printk( "\n*** END OF RECORDS BASE64 ZLIB ***\n" );
   }
 
-  _ISR_lock_Release( &_Record_Dump_base64_zlib_lock, &lock_context );
+  _ISR_lock_Release_and_ISR_enable( &_Record_Dump_base64_zlib_lock, &lock_context );
 }