diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 6a99178582a0..91d118c7ff7c 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -47,7 +47,6 @@
 #include "mozilla/dom/HTMLDNSPrefetch.h"
 #include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/SVGElementFactory.h"
-#include "nsLanguageAtomService.h"
 #include "nsMathMLAtoms.h"
 #include "nsMathMLOperators.h"
 #include "Navigator.h"
@@ -318,7 +317,6 @@ void nsLayoutStatics::Shutdown() {
   HTMLDNSPrefetch::Shutdown();
   nsCSSRendering::Shutdown();
   StaticPresData::Shutdown();
-  nsLanguageAtomService::Shutdown();
 #ifdef DEBUG
   nsIFrame::DisplayReflowShutdown();
 #endif
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
index f93ca57ee797..0dad576208e6 100644
--- a/xpcom/build/XPCOMInit.cpp
+++ b/xpcom/build/XPCOMInit.cpp
@@ -63,6 +63,7 @@
 
 #include "nsAtomTable.h"
 #include "nsISupportsImpl.h"
+#include "nsLanguageAtomService.h"
 
 #include "nsSystemInfo.h"
 #include "nsMemoryReporterManager.h"
@@ -762,6 +763,8 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
   nsComponentManagerImpl::gComponentManager = nullptr;
   nsCategoryManager::Destroy();
 
+  nsLanguageAtomService::Shutdown();
+
   GkRust_Shutdown();
 
 #ifdef NS_FREE_PERMANENT_DATA