diff --git a/app/controllers/env_controller.rb b/app/controllers/env_controller.rb
index de61c704..500cdee4 100644
--- a/app/controllers/env_controller.rb
+++ b/app/controllers/env_controller.rb
@@ -4,7 +4,7 @@ class EnvController < ActionController::Base
   skip_before_action :verify_authenticity_token
 
   def index
-    @site = Site.find_by_name('panel')
+    @site = Site.find_by_name('panel') || Site.first
 
     stale? @site if @site
   end
diff --git a/app/views/env/index.js.haml b/app/views/env/index.js.haml
index 597ba53f..8627fa4f 100644
--- a/app/views/env/index.js.haml
+++ b/app/views/env/index.js.haml
@@ -2,7 +2,7 @@
   = cache @site do
     :plain
       window.env = {
-        AIRBRAKE_SITE_ID: #{@site.id},
-        AIRBRAKE_API_KEY: "#{@site.airbrake_api_key}",
+        AIRBRAKE_PROJECT_ID: #{@site.id},
+        AIRBRAKE_PROJECT_KEY: "#{@site.airbrake_api_key}",
         PANEL_URL: "#{ENV['PANEL_URL']}"
       }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 16765965..eaa15eb4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,7 +15,7 @@
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
     = stylesheet_link_tag 'dark', rel: 'alternate stylesheet', media: 'all', 'data-turbolinks-track': 'reload', title: t('dark')
-    = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
+    = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', defer: true
     = stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload'
     = favicon_link_tag 'sutty_cuadrada.png', rel: 'apple-touch-icon', type: 'image/png'
     = render 'layouts/link_rel_alternate'