diff --git a/.htaccess b/.htaccess
index d82cb8ade17..5401320d577 100644
--- a/.htaccess
+++ b/.htaccess
@@ -45,6 +45,11 @@
   RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 
   # Rewrite rules for `front_controller_active`
+ SetEnv front_controller_active true
+ Options -MultiViews
+ <IfModule mod_dir.c>
+   DirectorySlash off
+ </IfModule>
   RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]
   RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]
   RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff)$
@@ -56,7 +61,6 @@
   RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php
   RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php
   RewriteRule .* index.php [PT,E=PATH_INFO:$1]
-
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz