diff --git a/.htaccess b/.htaccess
index 5401320d5771eb2b9a2fd0506267705cbad8dbd3..aabdafa0db4d2c74689eeb7e62408681f7a2b017 100644
--- a/.htaccess
+++ b/.htaccess
@@ -45,13 +45,12 @@
   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]
+  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)$
   RewriteCond %{REQUEST_FILENAME} !/remote.php
   RewriteCond %{REQUEST_FILENAME} !/public.php