diff --git a/cmd/postgres_exporter/util.go b/cmd/postgres_exporter/util.go
index 8907e7c5..a6d09627 100644
--- a/cmd/postgres_exporter/util.go
+++ b/cmd/postgres_exporter/util.go
@@ -216,5 +216,14 @@ func loggableDSN(dsn string) string {
 		pDSN.User = url.UserPassword(pDSN.User.Username(), "PASSWORD_REMOVED")
 	}
 
+	// Blank password data from parameters if not nil
+	q := pDSN.Query()
+	if q != nil {
+		if q.Get("password") != "" {
+			q.Set("password", "PASSWORD_REMOVED")
+			pDSN.RawQuery = q.Encode()
+		}
+	}
+
 	return pDSN.String()
 }