diff --git a/lib/simple_form/components/labels.rb b/lib/simple_form/components/labels.rb
index <HASH>..<HASH> 100644
--- a/lib/simple_form/components/labels.rb
+++ b/lib/simple_form/components/labels.rb
@@ -28,7 +28,7 @@ module SimpleForm
       end
 
       def label_text
-        SimpleForm.label_text.call(raw_label_text, required_label_text)
+        SimpleForm.label_text.call(raw_label_text, required_label_text).html_safe
       end
 
       def label_target
diff --git a/lib/simple_form/inputs/base.rb b/lib/simple_form/inputs/base.rb
index <HASH>..<HASH> 100644
--- a/lib/simple_form/inputs/base.rb
+++ b/lib/simple_form/inputs/base.rb
@@ -39,7 +39,7 @@ module SimpleForm
           send(component)
         end
         content.compact!
-        wrap(content.join).html_safe
+        wrap(content.join.html_safe)
       end
 
     protected
fix a couple of escaping issues in edge rails