diff --git a/public/src/translator.js b/public/src/translator.js
index 9923cf9517..67bdd0cc6a 100644
--- a/public/src/translator.js
+++ b/public/src/translator.js
@@ -160,7 +160,7 @@
 			fs = require('fs'),
 			Meta = require('../../src/meta');
 
-		utils.walk(path.join(__dirname, '../../', 'public/language/' + Meta.config.defaultLang), function (err, data) {
+		utils.walk(path.join(__dirname, '../../', 'public/language/' + (Meta.config.defaultLang || 'en')), function (err, data) {
 			var loaded = data.length;
 
 			for (var d in data) {
diff --git a/src/routes/api.js b/src/routes/api.js
index 101e2f4328..0f16d85bf6 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -44,7 +44,7 @@ var path = require('path'),
 				config.allowFileUploads = meta.config.allowFileUploads;
 				config.maximumFileSize = meta.config.maximumFileSize;
 				config.emailSetup = !!meta.config['email:from'];
-				config.defaultLang = meta.config.defaultLang;
+				config.defaultLang = meta.config.defaultLang || 'en';
 
 				res.json(200, config);
 			});