diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 3d5f0b57..cbd17621 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -366,7 +366,8 @@ class Server():
 
 		server_routes = self._router.urls + [
 			# various downloads
-			(r"/downloads/timelapse/([^/]*\.mpg)", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("timelapse")),
+			# .mpg and .mp4 timelapses:
+			(r"/downloads/timelapse/([^/]*\.mp[g4])", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("timelapse")),
 			                                                                                      download_handler_kwargs,
 			                                                                                      no_hidden_files_validator)),
 			(r"/downloads/files/local/(.*)", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("uploads")),
diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py
index afa3006d..490225ae 100644
--- a/src/octoprint/timelapse.py
+++ b/src/octoprint/timelapse.py
@@ -62,7 +62,7 @@ def get_finished_timelapses():
 	files = []
 	basedir = settings().getBaseFolder("timelapse")
 	for osFile in os.listdir(basedir):
-		if not fnmatch.fnmatch(osFile, "*.mpg"):
+		if not fnmatch.fnmatch(osFile, "*.mp[g4]"):
 			continue
 		statResult = os.stat(os.path.join(basedir, osFile))
 		files.append({