diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index 0c2577831eb..2265f9b6b92 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -7,9 +7,10 @@
 Handlebars.registerHelper('breakUp', function(property, hint, options) {
   var prop = Ember.Handlebars.get(this, property, options);
   if (!prop) return "";
-  hint = Ember.Handlebars.get(this, hint, options);
+  if (typeof(hint) !== 'string') hint = property;
 
-  return Discourse.Formatter.breakUp(prop, hint);
+  hint = Ember.Handlebars.get(this, hint, options);
+  return new Handlebars.SafeString(Discourse.Formatter.breakUp(prop, hint));
 });
 
 /**