diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index 7f4fb28f4ed3..91e88f41e2f6 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -86,7 +86,9 @@ category browser-quit-application-granted resource:///modules/Interactions.sys.m
 category browser-quit-application-granted resource:///modules/pagedata/PageDataService.sys.mjs PageDataService.uninit
 category browser-quit-application-granted resource://gre/modules/PageThumbs.sys.mjs PageThumbs.uninit
 category browser-quit-application-granted resource://gre/modules/NewTabUtils.sys.mjs NewTabUtils.uninit
+#ifdef MOZ_NORMANDY
 category browser-quit-application-granted resource://normandy/Normandy.sys.mjs Normandy.uninit
+#endif
 category browser-quit-application-granted resource://gre/modules/RFPHelper.sys.mjs RFPHelper.uninit
 category browser-quit-application-granted resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs ASRouterNewTabHook.destroy
 category browser-quit-application-granted moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.uninit
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 754c63f7c175..b40a62ffe260 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -135,7 +135,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] not in ("android", "windows"):
     DIRS += ["aboutwebauthn"]
 
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["messaging-system", "normandy"]
+    if CONFIG["MOZ_NORMANDY"]:
+        DIRS += ["normandy"]
+    DIRS += ["messaging-system"]
 
 DIRS += ["nimbus"]