diff --git a/app/views/layouts/_bugsnag.html.haml b/app/views/layouts/_bugsnag.html.haml
index 20c4304c84..a5e9ec32a1 100644
--- a/app/views/layouts/_bugsnag.html.haml
+++ b/app/views/layouts/_bugsnag.html.haml
@@ -1,3 +1,5 @@
-%script{src: "//d2wy8f7a9ursnm.cloudfront.net/v6/bugsnag.min.js"}
-:javascript
-  window.bugsnagClient = bugsnag('#{ENV["BUGSNAG_JS_KEY"]}');
+- bugsnag_js_key = ENV['BUGSNAG_JS_KEY'] || ENV['BUGSNAG_API_KEY']
+- if bugsnag_js_key.present?
+  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v6/bugsnag.min.js"}
+  :javascript
+    window.bugsnagClient = bugsnag("#{bugsnag_js_key}");
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 210c89b0f9..afc72caf83 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -37,7 +37,7 @@
           #footer
     %loading
 
-    = render "layouts/bugsnag" if ENV["BUGSNAG_JS_KEY"].present?
+    = render "layouts/bugsnag"
     %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
     %script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
     = javascript_include_tag "darkswarm/all"
diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml
index 5f5a9d2ec7..7446aa2f40 100644
--- a/app/views/spree/admin/shared/_head.html.haml
+++ b/app/views/spree/admin/shared/_head.html.haml
@@ -12,7 +12,7 @@
 %link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"}
 
 = stylesheet_link_tag 'admin/all'
-= render "layouts/bugsnag" if ENV["BUGSNAG_JS_KEY"].present?
+= render "layouts/bugsnag"
 = javascript_include_tag 'admin/all'
 
 = render "spree/admin/shared/translations"