diff --git a/src/helper.js b/src/helper.js
index 73c53262..a9ba455a 100644
--- a/src/helper.js
+++ b/src/helper.js
@@ -84,6 +84,14 @@ function setHome(homePath) {
 		log.warn("debug option is now an object, see defaults file for more information.");
 		this.config.debug = {ircFramework: true};
 	}
+
+	// TODO: Remove in future release
+	// Backwards compatibility for old way of specifying themes in settings
+	if (this.config.theme.includes(".css")) {
+		log.warn(`Referring to CSS files in the ${colors.green("theme")} setting of ${colors.green(Helper.CONFIG_PATH)} is ${colors.bold("deprecated")} and will be removed in a future version.`);
+	} else {
+		this.config.theme = `themes/${this.config.theme}.css`;
+	}
 }
 
 function getUserConfigPath(name) {
diff --git a/src/server.js b/src/server.js
index aebc6bfb..1cb377cc 100644
--- a/src/server.js
+++ b/src/server.js
@@ -201,11 +201,6 @@ function index(req, res, next) {
 		pkg,
 		Helper.config
 	);
-	if (!data.theme.includes(".css")) { // Backwards compatibility for old way of specifying themes in settings
-		data.theme = `themes/${data.theme}.css`;
-	} else {
-		log.warn(`Referring to CSS files in the ${colors.green("theme")} setting of ${colors.green(Helper.CONFIG_PATH)} is ${colors.bold("deprecated")} and will be removed in a future version.`);
-	}
 	data.gitCommit = Helper.getGitCommit();
 	data.themes = themes.getAll();