diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9053c4285..e304b24e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Bugfixes
 
 - [#1252](https://github.com/influxdata/telegraf/pull/1252): Fix systemd service. Thanks @zbindenren!
+- [#1221](https://github.com/influxdata/telegraf/pull/1221): Fix influxdb n_shards counter.
 
 ## v0.13.1 [2016-05-24]
 
diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go
index a0baaa266..53dd34a81 100644
--- a/plugins/inputs/influxdb/influxdb.go
+++ b/plugins/inputs/influxdb/influxdb.go
@@ -204,16 +204,16 @@ func (i *InfluxDB) gatherURL(
 			continue
 		}
 
-		if p.Name == "shard" {
-			shardCounter++
-		}
-
 		// If the object was a point, but was not fully initialized,
 		// ignore it and move on.
 		if p.Name == "" || p.Tags == nil || p.Values == nil || len(p.Values) == 0 {
 			continue
 		}
 
+		if p.Name == "shard" {
+			shardCounter++
+		}
+
 		// Add a tag to indicate the source of the data.
 		p.Tags["url"] = url
 
diff --git a/plugins/inputs/influxdb/influxdb_test.go b/plugins/inputs/influxdb/influxdb_test.go
index 9125b606a..517661e4a 100644
--- a/plugins/inputs/influxdb/influxdb_test.go
+++ b/plugins/inputs/influxdb/influxdb_test.go
@@ -112,7 +112,7 @@ func TestInfluxDB(t *testing.T) {
 
 	acc.AssertContainsTaggedFields(t, "influxdb",
 		map[string]interface{}{
-			"n_shards": 2,
+			"n_shards": 1,
 		}, map[string]string{})
 }