diff --git a/store/datastore/builds_test.go b/store/datastore/builds_test.go
index ee5305a78..8b3788387 100644
--- a/store/datastore/builds_test.go
+++ b/store/datastore/builds_test.go
@@ -268,6 +268,12 @@ func TestBuilds(t *testing.T) {
 			g.Assert(builds[0].RepoID).Equal(build2.RepoID)
 			g.Assert(builds[0].Status).Equal(build2.Status)
 		})
+
+		g.It("Should count Builds", func() {
+			count, err := s.GetBuildCount()
+			g.Assert(err == nil).IsTrue()
+			g.Assert(count > 0).IsTrue()
+		})
 	})
 }
 
diff --git a/store/datastore/sql/postgres/files/counts.sql b/store/datastore/sql/postgres/files/counts.sql
index 29948d932..b9c34cf1a 100644
--- a/store/datastore/sql/postgres/files/counts.sql
+++ b/store/datastore/sql/postgres/files/counts.sql
@@ -11,5 +11,4 @@ WHERE repo_active = true
 
 -- name: count-builds
 
-SELECT reltuples
-FROM pg_class WHERE relname = 'builds'
+SELECT currval('builds_build_id_seq');
diff --git a/store/datastore/sql/postgres/sql_gen.go b/store/datastore/sql/postgres/sql_gen.go
index 82475ce59..5cb3576b1 100644
--- a/store/datastore/sql/postgres/sql_gen.go
+++ b/store/datastore/sql/postgres/sql_gen.go
@@ -1,17 +1,3 @@
-// Copyright 2018 Drone.IO Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package postgres
 
 // Lookup returns the named statement.
@@ -108,8 +94,7 @@ WHERE repo_active = true
 `
 
 var countBuilds = `
-SELECT reltuples
-FROM pg_class WHERE relname = 'builds'
+SELECT currval('builds_build_id_seq');
 `
 
 var feedLatestBuild = `