diff --git a/src/app/panels/text/module.html b/src/app/panels/text/module.html
index 3db0a30d031..69582b72881 100644
--- a/src/app/panels/text/module.html
+++ b/src/app/panels/text/module.html
@@ -1,4 +1,4 @@
 <div ng-controller='text' ng-init="init()" style="min-height:{{panel.height || row.height}}" ng-dblclick="openEditor()">
-  <p ng-bind-html-unsafe="content">
+  <p ng-bind-html="content">
   </p>
 </div>
diff --git a/src/app/panels/text/module.js b/src/app/panels/text/module.js
index 98067cc7920..5127896e4cb 100644
--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -23,7 +23,7 @@ function (angular, app, _, require) {
   var module = angular.module('grafana.panels.text', []);
   app.useModule(module);
 
-  module.controller('text', function($scope, filterSrv) {
+  module.controller('text', function($scope, filterSrv, $sce) {
 
     $scope.panelMeta = {
       description : "A static text panel that can use plain text, markdown, or (sanitized) HTML"
@@ -81,7 +81,7 @@ function (angular, app, _, require) {
 
     $scope.updateContent = function(html) {
       try {
-        $scope.content = filterSrv.applyTemplateToTarget(html);
+        $scope.content = $sce.trustAsHtml(filterSrv.applyTemplateToTarget(html));
 
         if(!$scope.$$phase) {
           $scope.$apply();
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index 183561300c7..1d4f04c0606 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -58,7 +58,6 @@ module.exports = function(config,grunt) {
         'angular-strap',
         'directives/all',
         'jquery.flot.pie',
-        'angular-sanitize',
         'angular-dragdrop',
       ]
     }