diff --git a/.htaccess b/.htaccess
index 740329e15a..bb030c6acc 100644
--- a/.htaccess
+++ b/.htaccess
@@ -45,6 +45,7 @@
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
+  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
   RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 
   # Rewrite rules for `front_controller_active`
@@ -60,6 +61,7 @@
   RewriteCond %{REQUEST_FILENAME} !/status.php
   RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php
   RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php
+  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
   RewriteRule .* index.php [PT,E=PATH_INFO:$1]
 </IfModule>
 <IfModule mod_mime.c>