diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed5be3e20a7..5989ad51079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 **Fixes**
 - [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
+- [Issue #2442](https://github.com/grafana/grafana/issues/2442). Templating: Fix text panel when using template variables in text in in repeated panel
 
 # 2.1.0 (2015-08-04)
 
diff --git a/public/app/panels/text/module.js b/public/app/panels/text/module.js
index 436a9982b41..7dc98bcf136 100644
--- a/public/app/panels/text/module.js
+++ b/public/app/panels/text/module.js
@@ -93,7 +93,7 @@ function (angular, app, _, require, PanelMeta) {
 
     $scope.updateContent = function(html) {
       try {
-        $scope.content = $sce.trustAsHtml(templateSrv.replace(html));
+        $scope.content = $sce.trustAsHtml(templateSrv.replace(html, $scope.panel.scopedVars));
       } catch(e) {
         console.log('Text panel error: ', e);
         $scope.content = $sce.trustAsHtml(html);