--- a/toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.cc
@@ -810,16 +810,17 @@ bool ExceptionHandler::Setup(bool instal
   if (install_handler && result == KERN_SUCCESS)
     if (!InstallHandler())
       return false;
 
   // Don't spawn the handler thread when replaying, as we have not set up
   // exception ports for it to monitor.
   if (result == KERN_SUCCESS && !mozilla::recordreplay::IsReplaying()) {
     // Install the handler in its own thread, detached as we won't be joining.
+    mozilla::recordreplay::AutoPassThroughThreadEvents pt;
     pthread_attr_t attr;
     pthread_attr_init(&attr);
     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
     int thread_create_result = pthread_create(&handler_thread_, &attr,
                                               &WaitForMessage, this);
     pthread_attr_destroy(&attr);
     result = thread_create_result ? KERN_FAILURE : KERN_SUCCESS;
   }

--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -285,17 +285,17 @@ void XRE_SetProcessType(const char* aPro
 bool
 #if defined(XP_WIN)
 XRE_SetRemoteExceptionHandler(const char* aPipe /*= 0*/,
                               uintptr_t aCrashTimeAnnotationFile)
 #else
 XRE_SetRemoteExceptionHandler(const char* aPipe /*= 0*/)
 #endif
 {
-  recordreplay::AutoPassThroughThreadEvents pt;
+  recordreplay::AutoPassThroughThreadEventsWithLocalReplay pt;
 #if defined(XP_WIN)
   return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe),
                                                   aCrashTimeAnnotationFile);
 #elif defined(XP_MACOSX)
   return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe));
 #else
   return CrashReporter::SetRemoteExceptionHandler();
 #endif
@@ -430,17 +430,17 @@ nsresult XRE_InitChildProcess(int aArgc,
 #  if defined(MOZ_SANDBOX)
   // Save the original number of arguments to pass to the sandbox
   // setup routine which also uses the crash server argument.
   int allArgc = aArgc;
 #  endif /* MOZ_SANDBOX */
 
   const char* const mach_port_name = aArgv[--aArgc];
 
-  Maybe<recordreplay::AutoPassThroughThreadEvents> pt;
+  Maybe<recordreplay::AutoPassThroughThreadEventsWithLocalReplay> pt;
   pt.emplace();
 
   const int kTimeoutMs = 1000;
 
   MachSendMessage child_message(0);
   if (!child_message.AddDescriptor(MachMsgPortDescriptor(mach_task_self()))) {
     NS_WARNING("child AddDescriptor(mach_task_self()) failed.");
     return NS_ERROR_FAILURE;