diff --git a/config/application.rb b/config/application.rb
index bd44ba6d..84bc43ab 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -86,7 +86,7 @@ module Qwaiter
     config.active_support.escape_html_entities_in_json = true
 
 
-    config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates]
+    config.handlebars.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates] if defined?(Ember::Rails) && defined?(Handlebars)
 
     config.generators do |g|
       g.orm :simply_stored
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e73656ad..036deb92 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -25,7 +25,7 @@ Qwaiter::Application.configure do
   # Don't fallback to assets pipeline if a precompiled asset is missed
   config.assets.compile = false
 
-  config.ember.variant = :production
+  config.ember.variant = :production if defined?(Ember::Rails)
 
   # Generate digests for assets URLs
   config.assets.digest = true