diff --git a/database/pgsql/pgsql.go b/database/pgsql/pgsql.go
index 19cf5ebc..15789dd9 100644
--- a/database/pgsql/pgsql.go
+++ b/database/pgsql/pgsql.go
@@ -89,7 +89,7 @@ func (pgSQL *pgSQL) Close() {
 }
 
 func (pgSQL *pgSQL) Ping() bool {
-	return pgSQL.Ping()
+	return pgSQL.DB.Ping() == nil
 }
 
 // Open creates a Datastore backed by a PostgreSQL database.