diff --git a/src/controllers/index.js b/src/controllers/index.js
index f62b0e7d10..f691204aa7 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -80,11 +80,7 @@ Controllers.home = function(req, res, next) {
 			});
 		}
 	}, function (err, data) {
-		if (res.locals.isAPI) {
-			res.json(data);
-		} else {
-			res.render('home', data);
-		}
+		res.render('home', data);
 	});
 };
 
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 2944e6f0e0..703008cab9 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -276,6 +276,10 @@ middleware.processRender = function(req, res, next) {
 			fn = defaultFn;
 		}
 
+		if (res.locals.isAPI) {
+			return res.json(options);
+		}
+
 		render.call(self, template, options, function(err, str) {
 			if (res.locals.footer) {
 				str = str + res.locals.footer;