diff --git a/app/controller/ember_cli/ember_controller.rb b/app/controller/ember_cli/ember_controller.rb
index 2ad6fd8e..6f32e378 100644
--- a/app/controller/ember_cli/ember_controller.rb
+++ b/app/controller/ember_cli/ember_controller.rb
@@ -1,5 +1,9 @@
 module EmberCli
-  class EmberController < ActionController::Base
+  class EmberController < ::ApplicationController
+    (::ActionController::Base::MODULES - ::ActionController::API::MODULES).each do |mod|
+      include mod
+    end
+
     def index
       render layout: false
     end