diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 56c841b9..18ea638d 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -806,12 +806,10 @@ class Server():
 		assets.updater = UpdaterType
 
 		enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"])
-		enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"]))
 		preferred_stylesheet = settings().get(["devel", "stylesheet"])
 
 		dynamic_assets = util.flask.collect_plugin_assets(
 			enable_gcodeviewer=enable_gcodeviewer,
-			enable_timelapse=enable_timelapse,
 			preferred_stylesheet=preferred_stylesheet
 		)
 
diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py
index 681e0898..70609546 100644
--- a/src/octoprint/server/util/flask.py
+++ b/src/octoprint/server/util/flask.py
@@ -600,7 +600,7 @@ class SettingsCheckUpdater(webassets.updater.BaseUpdater):
 
 ##~~ plugin assets collector
 
-def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, preferred_stylesheet="css"):
+def collect_plugin_assets(enable_gcodeviewer=True, preferred_stylesheet="css"):
 	logger = logging.getLogger(__name__ + ".collect_plugin_assets")
 
 	supported_stylesheets = ("css", "less")
@@ -623,6 +623,7 @@ def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, prefer
 		'js/app/viewmodels/slicing.js',
 		'js/app/viewmodels/temperature.js',
 		'js/app/viewmodels/terminal.js',
+		'js/app/viewmodels/timelapse.js',
 		'js/app/viewmodels/users.js',
 		'js/app/viewmodels/log.js',
 		'js/app/viewmodels/usersettings.js'
@@ -634,8 +635,6 @@ def collect_plugin_assets(enable_gcodeviewer=True, enable_timelapse=True, prefer
 			'gcodeviewer/js/gCodeReader.js',
 			'gcodeviewer/js/renderer.js'
 		]
-	if enable_timelapse:
-		assets["js"].append('js/app/viewmodels/timelapse.js')
 
 	if preferred_stylesheet == "less":
 		assets["less"].append('less/octoprint.less')