diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index a574776b..4f6f2cc3 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -617,6 +617,7 @@ class Server(object):
 		s = settings()
 
 		app.debug = self._debug
+		app.config["TEMPLATES_AUTO_RELOAD"] = True
 
 		secret_key = s.get(["server", "secretKey"])
 		if not secret_key: