--- a/tools/profiler/gecko/nsProfiler.cpp
+++ b/tools/profiler/gecko/nsProfiler.cpp
@@ -14,26 +14,31 @@
 #include "nsIObserverService.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 #include "nsIWebNavigation.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "shared-libraries.h"
 #include "js/Value.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/dom/Promise.h"
 
 using mozilla::ErrorResult;
+using mozilla::Preferences;
 using mozilla::dom::Promise;
 using std::string;
 
+static const char* kAsyncStacksPrefName = "javascript.options.asyncstack";
+
 NS_IMPL_ISUPPORTS(nsProfiler, nsIProfiler)
 
 nsProfiler::nsProfiler()
   : mLockedForPrivateBrowsing(false)
+  , mAsyncStacksWereEnabled(false)
 {
 }
 
 nsProfiler::~nsProfiler()
 {
   nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
   if (observerService) {
     observerService->RemoveObserver(this, "chrome-document-global-created");
@@ -82,25 +87,32 @@ NS_IMETHODIMP
 nsProfiler::StartProfiler(uint32_t aEntries, double aInterval,
                           const char** aFeatures, uint32_t aFeatureCount,
                           const char** aThreadNameFilters, uint32_t aFilterCount)
 {
   if (mLockedForPrivateBrowsing) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
+  mAsyncStacksWereEnabled = Preferences::GetBool(kAsyncStacksPrefName);
+  if (mAsyncStacksWereEnabled) {
+    Preferences::SetBool(kAsyncStacksPrefName, false);
+  }
+
   profiler_start(aEntries, aInterval,
                  aFeatures, aFeatureCount,
                  aThreadNameFilters, aFilterCount);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsProfiler::StopProfiler()
 {
+  Preferences::SetBool(kAsyncStacksPrefName, mAsyncStacksWereEnabled);
+
   profiler_stop();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsProfiler::IsPaused(bool *aIsPaused)
 {
   *aIsPaused = profiler_is_paused();
@@ -300,9 +312,9 @@ nsProfiler::GetProfileGatherer(nsISuppor
   if (!profiler_is_active()) {
     *aRetVal = nullptr;
   } else {
     nsCOMPtr<nsISupports> gatherer;
     profiler_get_gatherer(getter_AddRefs(gatherer));
     gatherer.forget(aRetVal);
   }
   return NS_OK;
-}
\ No newline at end of file
+}

--- a/tools/profiler/gecko/nsProfiler.h
+++ b/tools/profiler/gecko/nsProfiler.h
@@ -18,12 +18,13 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
     NS_DECL_NSIPROFILER
 
     nsresult Init();
 private:
     ~nsProfiler();
     bool mLockedForPrivateBrowsing;
+    bool mAsyncStacksWereEnabled;
 };
 
 #endif /* _NSPROFILER_H_ */