diff --git a/app/components/layout/common_html_attributes_component.rb b/app/components/layout/common_html_attributes_component.rb
index 63f35e0f6..c79881ba6 100644
--- a/app/components/layout/common_html_attributes_component.rb
+++ b/app/components/layout/common_html_attributes_component.rb
@@ -4,18 +4,18 @@ class Layout::CommonHtmlAttributesComponent < ApplicationComponent
   private
 
     def attributes
-      sanitize([dir, lang, html_class].compact.join(" "))
+      tag.attributes(dir: dir, lang: lang, class: html_class)
     end
 
     def dir
-      'dir="rtl"' if rtl?
+      "rtl" if rtl?
     end
 
     def lang
-      "lang=\"#{I18n.locale}\""
+      I18n.locale
     end
 
     def html_class
-      "class=\"tenant-#{Tenant.current_schema}\"" if Rails.application.config.multitenancy
+      "tenant-#{Tenant.current_schema}" if Rails.application.config.multitenancy
     end
 end