diff --git a/toolkit/crashreporter/client/crashreporter.cpp b/toolkit/crashreporter/client/crashreporter.cpp
index d33731d02d71..10aa65dd2406 100644
--- a/toolkit/crashreporter/client/crashreporter.cpp
+++ b/toolkit/crashreporter/client/crashreporter.cpp
@@ -513,6 +513,8 @@ bool CheckEndOfLifed(string version)
   return UIFileExists(reportPath);
 }
 
+#ifndef RELEASE_OR_BETA
+
 static string
 GetMinidumpAnalyzerPath()
 {
@@ -524,6 +526,8 @@ GetMinidumpAnalyzerPath()
   return path;
 }
 
+#endif
+
 int main(int argc, char** argv)
 {
   gArgc = argc;
@@ -545,8 +549,11 @@ int main(int argc, char** argv)
     // no dump file specified, run the default UI
     UIShowDefaultUI();
   } else {
-    // start by running minidump analyzer
+#ifndef RELEASE_OR_BETA
+    // start by running minidump analyzer, this is currently enabled only in
+    // nightly and aurora
     UIRunMinidumpAnalyzer(GetMinidumpAnalyzerPath(), gReporterDumpFile);
+#endif
 
     // go ahead with the crash reporter
     gExtraFile = GetAdditionalFilename(gReporterDumpFile, kExtraDataExtension);
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
index 494c5cc82eaf..43a09c7ab41a 100644
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -51,14 +51,10 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
 
 DIRS += [
     'client',
+    'jsoncpp/src/lib_json',
+    'minidump-analyzer',
 ]
 
-if CONFIG['NIGHTLY_BUILD']:
-    DIRS += [
-        'jsoncpp/src/lib_json',
-        'minidump-analyzer',
-    ]
-
 if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
     DIRS += ['injector']
     UNIFIED_SOURCES += [