diff --git a/packages/ember-cli-fastboot/index.js b/packages/ember-cli-fastboot/index.js
index 10ee7b75b..373cc0826 100644
--- a/packages/ember-cli-fastboot/index.js
+++ b/packages/ember-cli-fastboot/index.js
@@ -337,7 +337,10 @@ module.exports = {
           }
 
           let fastbootMiddleware = FastBootExpressMiddleware({
-            fastboot: this.fastboot
+            fastboot: this.fastboot,
+            visitOptions: {
+              renderMode: this.fastbootOptions.renderMode
+            }
           });
 
           fastbootMiddleware(req, resp, next);
diff --git a/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js b/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js
index 0f7e5b659..84e334e69 100644
--- a/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js
+++ b/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js
@@ -31,6 +31,7 @@ module.exports = class FastBootConfig extends Plugin {
     this.fastbootConfig = {};
     this.fastbootConfig[appConfigModule] = options.appConfig;
     this._fileToChecksumMap = {};
+    this.renderMode = this.fastbootAppConfig.renderMode;
 
     if (this.fastbootAppConfig && this.fastbootAppConfig.htmlFile) {
       this.htmlFile = this.fastbootAppConfig.htmlFile;
@@ -174,6 +175,7 @@ module.exports = class FastBootConfig extends Plugin {
         schemaVersion: LATEST_SCHEMA_VERSION,
         manifest: this.manifest,
         hostWhitelist: this.normalizeHostWhitelist(),
+        renderMode: this.renderMode,
         config: this.fastbootConfig,
         appName: this.appName,
       }