diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55195b3d9ab..c9c498fc1dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 **Fixes**
 - [Issue #545](https://github.com/grafana/grafana/issues/545). Chart: Fix formatting negative values (axis formats, legend values)
 - [Issue #460](https://github.com/grafana/grafana/issues/460). Chart: fix for max legend value when max value is zero
+- [Issue #628](https://github.com/grafana/grafana/issues/628). Filtering: Fix for nested filters, changing a child filter could result in infinite recursion in some cases
 
 # 1.6.1 (2014-06-24)
 
diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js
index 90c1ed4b22c..bbacef01981 100644
--- a/src/app/panels/filtering/module.js
+++ b/src/app/panels/filtering/module.js
@@ -53,7 +53,7 @@ function (angular, app, _) {
         if (templateParam === updatedTemplatedParam) {
           return;
         }
-        if (templateParam.query.indexOf(updatedTemplatedParam.name) !== -1) {
+        if (templateParam.query.indexOf('[[' + updatedTemplatedParam.name + ']]') !== -1) {
           return $scope.applyFilter(templateParam);
         }
       });