diff --git a/.htaccess b/.htaccess
index 230f6ae330..05d142348b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -50,9 +50,6 @@
 
   # Rewrite rules for `front_controller_active`
   Options -MultiViews
-  <IfModule mod_dir.c>
-    DirectorySlash off
-  </IfModule>
   RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1]
   RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1]
   RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff)$
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 814d78679e..869a87fbf1 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -439,6 +439,9 @@ class Setup {
 		$content.="\n  RewriteBase ".$webRoot;
 		$content .= "\n  <IfModule mod_env.c>";
 		$content .= "\n    SetEnv front_controller_active true";
+		$content .= "\n    <IfModule mod_dir.c>";
+		$content .= "\n      DirectorySlash off";
+		$content .= "\n    </IfModule>";
 		$content.="\n  </IfModule>";
 		$content.="\n</IfModule>";