diff --git a/docs/static_site/src/.htaccess b/docs/static_site/src/.htaccess
index 21cb83a11dd6..ba40eff5d319 100644
--- a/docs/static_site/src/.htaccess
+++ b/docs/static_site/src/.htaccess
@@ -47,6 +47,9 @@ RewriteCond %{REQUEST_FILENAME} -d
 RewriteCond %{REQUEST_FILENAME}/index.html -f
 RewriteRule ^(.*) $1/index.html [NC,L]
 
+# Redirect FAQ TODO: temporary fix for Github issue #18547
+RewriteRule ^versions/master/faq/(.*)$ /api/faq/$1 [R,NC,L]
+
 # 404
 ErrorDocument 404 /404.html