diff --git a/.htaccess b/.htaccess
index 0f826d7e93fdf..1d9d7677bc665 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,6 +7,10 @@ AddType font/woff .woff
 <ifModule mod_rewrite.c>
     RewriteEngine On
 
+    # No Trailing-slash
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^(.*)/$ /$1 [L,R=301]
+
     RewriteRule ^assets - [L,NC]
     RewriteRule ^extensions/([^/]+) - [L,NC]
     RewriteRule ^extensions/([^/]+)/assets - [L,NC]