diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf8e2f6d330..c9acfa4de25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ vNext
 
 - Fixes regex InfluxDB queries intoduced in 1.6.0 (PR #500)
 - Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names (Fixes #506)
+- Series names and column name typeahead cache fix (Fixes #522)
 
 # 1.6.0 (2014-06-16)
 
diff --git a/src/app/controllers/influxTargetCtrl.js b/src/app/controllers/influxTargetCtrl.js
index f94844e380e..b0693a85ccf 100644
--- a/src/app/controllers/influxTargetCtrl.js
+++ b/src/app/controllers/influxTargetCtrl.js
@@ -42,6 +42,7 @@ function (angular) {
     $scope.seriesBlur = function() {
       if ($scope.oldSeries !== $scope.target.series) {
         $scope.oldSeries = $scope.target.series;
+        $scope.columnList = null;
         $scope.get_data();
       }
     };
@@ -67,7 +68,7 @@ function (angular) {
     };
 
     $scope.listSeries = function(query, callback) {
-      if (!seriesList) {
+      if (!seriesList || query === '') {
         seriesList = [];
         $scope.datasource.listSeries().then(function(series) {
           seriesList = series;