diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
index ab5a8b2d9586deb116b524485877b29e26df1db8..df903c9d1f0fcb601abfb48f28ff67a1a0db0d54 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html
@@ -86,13 +86,13 @@ function o_start(){
 	<script type="text/javascript" src='$r.staticLink("bootstrap/javascripts/bootstrap/modal.js")'></script>
 	<script type="text/javascript" src='$r.staticLink("bootstrap/javascripts/bootstrap/tooltip.js")'></script>
 	<script type="text/javascript" src='$r.staticLink("bootstrap/javascripts/bootstrap/popover.js")'></script>
+	## The OpenOLAT video player. In separate file as it is also used in content iframes
+	<script type="text/javascript" src='$r.staticLink("movie/player.js")'></script>	
 #else
 	<script type="text/javascript" src='$r.staticLink("js/js.plugins.min.js")'></script>
+	<script type="text/javascript" src='$r.staticLink("movie/player.min.js")'></script>
 #end
 
-## The OpenOLAT video player. In separate file as it is also used in content iframes
-<script type="text/javascript" src='$r.staticLink("movie/player.js")'></script>
-
 #if($r.available("guidebug"))
 	<link type="text/css" href='$r.staticLink("js/jquery/tagsinput/bootstrap-tagsinput.css")' rel="stylesheet" />
 	<link type="text/css" href='$r.staticLink("js/jquery/fullcalendar/fullcalendar.css")' rel="stylesheet" />
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
index f61dfc88595d7e5b180e77bf3fdca25faab200e7..6bf18fd7539e130e2e25c94d6aa7d5313a763a73 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
@@ -25,6 +25,7 @@ import java.util.Map;
 
 import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
 import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
+import org.olat.core.helpers.Settings;
 
 /**
  * Description:<br>
@@ -64,7 +65,15 @@ public class OlatMovieViewerPlugin extends TinyMCECustomPlugin {
 
 		// Get static URI for transparent GIF.
 		params.put("transparentImage", StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false));
-		params.put("playerScript", StaticMediaDispatcher.createStaticURIFor("movie/player.js", true));
+		
+		// In production, we use the minified player, for debug the non-minified.
+		// However, in production the non-minified must be available as well to
+		// be compatible with old content that embedded the other code. 
+		if (Settings.isDebuging()) {
+			params.put("playerScript", StaticMediaDispatcher.createStaticURIFor("movie/player.js", true));
+		} else {
+			params.put("playerScript", StaticMediaDispatcher.createStaticURIFor("movie/player.min.js", true));			
+		}
 
 		setPluginParameters(params);
 		return params;