diff --git a/app/initializers/fastboot.js b/app/initializers/fastboot.js
index 2ab82fbdf..99081c2f2 100644
--- a/app/initializers/fastboot.js
+++ b/app/initializers/fastboot.js
@@ -40,7 +40,10 @@ export default {
 
         var promise;
         Ember.run(function() {
-          promise = App.visit(url);
+          promise = App.visit(url, {
+            document: doc,
+            rootElement: doc
+          });
         });
 
         return promise.then(function(instance) {
diff --git a/app/instance-initializers/clear-double-boot.js b/app/instance-initializers/clear-double-boot.js
index 2508b07d1..9d3eee944 100644
--- a/app/instance-initializers/clear-double-boot.js
+++ b/app/instance-initializers/clear-double-boot.js
@@ -11,8 +11,12 @@ export default {
   initialize: function(instance) {
     var originalDidCreateRootView = instance.didCreateRootView;
 
-    instance.didCreateRootView = function() {
-      Ember.$(instance.rootElement + ' .ember-view').remove();
+    instance.didCreateRootView = function(view) {
+      if( Ember.$ ) {
+        Ember.$(instance.rootElement + ' .ember-view').remove();
+      } else {
+        instance.view = view;
+      }
 
       originalDidCreateRootView.apply(instance, arguments);
     };