diff --git a/packages/pg/lib/client.js b/packages/pg/lib/client.js
index 3bfffc7d2..3525cf5ac 100644
--- a/packages/pg/lib/client.js
+++ b/packages/pg/lib/client.js
@@ -716,6 +716,7 @@ class Client extends EventEmitter {
     if (!this.connection._connecting || this._ended) {
       if (cb) {
         cb()
+        return
       } else {
         return this._Promise.resolve()
       }
diff --git a/packages/pg/lib/native/client.js b/packages/pg/lib/native/client.js
index 6df471b83..fa17d9f65 100644
--- a/packages/pg/lib/native/client.js
+++ b/packages/pg/lib/native/client.js
@@ -249,8 +249,10 @@ Client.prototype.end = function (cb) {
 
   this._ending = true
 
-  if (!this._connected) {
-    this.once('connect', this.end.bind(this, cb))
+  if (this._connecting && !this._connected) {
+    this.once('connect', () => {
+      this.end(() => {})
+    })
   }
   let result
   if (!cb) {
diff --git a/packages/pg/test/integration/client/api-tests.js b/packages/pg/test/integration/client/api-tests.js
index ab7ad6db8..2b0c3f85b 100644
--- a/packages/pg/test/integration/client/api-tests.js
+++ b/packages/pg/test/integration/client/api-tests.js
@@ -230,6 +230,21 @@ suite.test('callback is fired once and only once', function (done) {
   )
 })
 
+suite.test('no-op Client#end callback is called exactly once', (done) => {
+  const client = new helper.Client()
+  let called = false
+
+  client.end(() => {
+    assert(!called)
+    called = true
+
+    client.connect((err) => {
+      assert.ifError(err)
+      client.end(done)
+    })
+  })
+})
+
 suite.test('can provide callback and config object', function (done) {
   const pool = new pg.Pool()
   pool.connect(