diff --git a/htaccess.txt b/htaccess.txt
index 55f4e6be971f5..ad1ac2fdb2690 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -62,6 +62,10 @@ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 # If the requested path and file is not /index.php and the request
 # has not already been internally rewritten to the index.php script
 RewriteCond %{REQUEST_URI} !^/index\.php
+# and the request is for something within the component folder,
+# or for an extensionless URL at the site root, or the
+# requested URL ends with an extension
+RewriteCond %{REQUEST_URI} /component/|(/[^.]*|\.[^.]+)$ [NC]
 # and the requested path and file doesn't directly match a physical file
 RewriteCond %{REQUEST_FILENAME} !-f
 # and the requested path and file doesn't directly match a physical folder
diff --git a/web.config.txt b/web.config.txt
index 476e990fbcfd3..e904cb6737f67 100644
--- a/web.config.txt
+++ b/web.config.txt
@@ -17,6 +17,7 @@
                    <match url="(.*)" ignoreCase="false" />
                    <conditions logicalGrouping="MatchAll">
                      <add input="{URL}" pattern="^/index.php" ignoreCase="true" negate="true" />
+                     <add input="{URL}" pattern="/component/|(/[^.]*|\.[^.]+)$" ignoreCase="true" />
                      <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
                      <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
                    </conditions>