diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
index a1eab90d2117989866cc297ff3edbef2f62e5f7c..57af613912ddf8b9aa2e07caec9d8b14bb924336 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementRenderer.java
@@ -106,17 +106,19 @@ public class FileElementRenderer implements ComponentRenderer {
 	 			sb.append(" onchange=\"b_handleFileUploadFormChange(this, this.form.fake_").append(id).append(", this.form.upload)\"");
 	 		}
 	 		// Add mime type restriction
-	 		Set<String> mimeTypes = fileElem.getMimeTypeLimitations();
-	 		if (mimeTypes.size() > 0 ) {
-	 			sb.append(" accept=\"");
-	 			Iterator iterator = mimeTypes.iterator();
-	 			while (iterator.hasNext()) {
-					String type = (String) iterator.next();
-					sb.append(type);
-					if (iterator.hasNext()) sb.append(",");
-				}
-	 			sb.append("\"");
-	 		}
+//TODO: This does unfortunately not work in the different browsers. Not even video/* does work properly in safari. 
+// We do not limit the selection here, check file type later on the server which is way more stable than this fancy "accept" attribute
+//	 		Set<String> mimeTypes = fileElem.getMimeTypeLimitations();
+//	 		if (mimeTypes.size() > 0 ) {
+//	 			sb.append(" accept=\"");
+//	 			Iterator iterator = mimeTypes.iterator();
+//	 			while (iterator.hasNext()) {
+//					String type = (String) iterator.next();
+//					sb.append(type);
+//					if (iterator.hasNext()) sb.append(",");
+//				}
+//	 			sb.append("\"");
+//	 		}
 	 		// Add pseudo focus marker on fake file chooser button
 	 		sb.append(" onfocus=\"this.form.fake_").append(id).append(".nextSibling.style.border = '1px dotted black';\"");
 	 		sb.append(" onblur=\"this.form.fake_").append(id).append(".nextSibling.style.border = '0';\"");
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b64d870ba87d16691b783d3b912a15881096d219..a405c140e0bae5934a9493f0cc8701f5bde73a4a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -357,11 +357,11 @@
 	</mime-mapping>
 	<mime-mapping>
 		<extension>m4a</extension>
-		<mime-type>audio/x-aac</mime-type>
+		<mime-type>audio/x-m4a</mime-type>
 	</mime-mapping>
 	<mime-mapping>
 		<extension>m4v</extension>
-		<mime-type>video/mp4</mime-type>
+		<mime-type>video/x-m4v</mime-type>
 	</mime-mapping>
 
 </web-app>