diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml
index 65b9b8abc7..f6b93139ce 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2-Fluid.cshtml
@@ -67,10 +67,7 @@
             foreach (JProperty property in cfg.Properties())
             {
                 var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    attrs.Add(property.Name + "='" + propertyValue + "'");
-                }
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
             }
 
         JObject style = contentItem.styles;
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
index 37e3c84dad..c5fabe2abf 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
@@ -67,10 +67,7 @@
             foreach (JProperty property in cfg.Properties())
             {
                 var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    attrs.Add(property.Name + "=\"" + propertyValue + "\"");
-                }
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
             }
 
         JObject style = contentItem.styles;
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
index 45be239245..b7e8ef34fb 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
@@ -63,10 +63,7 @@
             foreach (JProperty property in cfg.Properties())
             {
                 var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    attrs.Add(property.Name + "='" + propertyValue + "'");
-                }
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
             }
 
         JObject style = contentItem.styles;
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
index afadd3d93e..3a4fa3b8e2 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -67,10 +67,7 @@
             foreach (JProperty property in cfg.Properties())
             {
                 var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    attrs.Add(property.Name + "=\"" + propertyValue +"\"");
-                }
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
             }
 
         JObject style = contentItem.styles;
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
index 4a15201997..5a570efdb5 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -16,6 +16,6 @@
 else
 {
     <text>
-        <div style="@Model.editor.config.style">@TemplateUtilities.CleanForXss(Model.value.ToString())</div>
+        <div style="@Model.editor.config.style">@Model.value</div>
     </text>
 }