diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0ba0ffc37e..e21fb1ce14 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -34,7 +34,7 @@
= yield :header_tags
- - body_classes ||= @body_classes
+ - body_classes ||= @body_classes || ''
- body_classes += ' system-font' if current_account&.user&.setting_system_font_ui
%body{ class: add_rtl_body_class(body_classes) }