diff --git a/CHANGELOG.md b/CHANGELOG.md
index f96c33bb..f9a0d40a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,14 @@
 * [#1047](https://github.com/foosel/OctoPrint/issues/1047) - Fixed 90 degree
   webcam rotation for iOS Safari.
 
+## 1.2.17rc4 (2016-10-17)
+
+### Bug fixes
+
+  * Properly handle empty JS file list from plugins. Solves a 500 on OctoPrint instances without any third party plugins installed generated during web asset bundling introduced in 1.2.17rc2.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17rc3...1.2.17rc4))
+
 ## 1.2.17rc3 (2016-10-13)
 
 ### Bug fixes
diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index ca08f05d..ace1ab2a 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -1044,6 +1044,8 @@ class Server(object):
 		     "js/app/helpers.js",
 		     "js/app/main.js"]
 		js_plugins = dynamic_plugin_assets["external"]["js"]
+		if len(js_plugins) == 0:
+			js_plugins = ["empty"]
 		js_app = js_plugins + js_core
 
 		css_libs = [