diff --git a/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_content/editor.html b/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_content/editor.html
index f2e5b7d0e73d6b4685da02ad84dd0e1216291ea6..a960879da4d6e7fe9cf7e7a0066559d7da6d074a 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_content/editor.html
+++ b/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_content/editor.html
@@ -8,9 +8,21 @@
 		<script src="$apiUrl"></script>
 		<script>
 		/* <![CDATA[ */
-			jQuery('$id').ready(function(){
-				new DocsAPI.DocEditor("$id", $apiConfig);
-			});
+		## Make sure the OnlyOffice JS-Library is loaded and ready.
+		function loadEditor() {
+			var waitForLoad = function() {
+				if (typeof DocsAPI != "undefined") {
+					new DocsAPI.DocEditor("$id", $apiConfig);
+				} else {
+					window.setTimeout(waitForLoad, 500);
+				}
+			};
+			window.setTimeout(waitForLoad, 500);
+		}
+
+		jQuery("$id").ready(function() {
+			loadEditor();
+		});
 		/* ]]> */
 		</script>
 	#end
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/ui/_content/standalone_open.html b/src/main/java/org/olat/core/commons/services/doceditor/ui/_content/standalone_open.html
index 52f265c911b941cc6d4bddf68855cd3e2694f5c6..5ca5713486ec4c194f9be84fd56f3a18313cee72 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/ui/_content/standalone_open.html
+++ b/src/main/java/org/olat/core/commons/services/doceditor/ui/_content/standalone_open.html
@@ -3,10 +3,4 @@
 	<div class="o_button_group">
 		$r.render("open.button")
 	</div>
-</div>
-<script>
-/* <![CDATA[ */
-##jQuery(document).ready(function() { $r.backgroundCommand("open"); })
-##jQuery(document).ready(function() { $r.openJavaScriptCommand("open")); })
-/* ]]> */
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file