diff --git a/src/main/java/org/olat/core/gui/themes/Theme.java b/src/main/java/org/olat/core/gui/themes/Theme.java
index 8b4decc77c45117f90951111fdca5834c0d269b3..0d6a977cede5ddad9a81d86593bbbb3fac1b76bc 100644
--- a/src/main/java/org/olat/core/gui/themes/Theme.java
+++ b/src/main/java/org/olat/core/gui/themes/Theme.java
@@ -75,6 +75,10 @@ public class Theme {
 	private File getCustomJSFile() {
 		String staticThemesPath = WebappHelper.getContextRoot() + "/static/themes/";
 		File themeFolder = new File(staticThemesPath, Settings.getGuiThemeIdentifyer());
+		if (!themeFolder.exists() && Settings.getGuiCustomThemePath() != null) {
+			// fallback to custom themes folder
+			themeFolder = new File(Settings.getGuiCustomThemePath(), Settings.getGuiThemeIdentifyer());
+		}
 		return new File(themeFolder, CUSTOMFILENAME);
 	}