diff --git a/satellite/metabase/commit.go b/satellite/metabase/commit.go
index 9bbd3479a..86a42bcab 100644
--- a/satellite/metabase/commit.go
+++ b/satellite/metabase/commit.go
@@ -136,7 +136,7 @@ func (db *DB) BeginObjectNextVersion(ctx context.Context, opts BeginObjectNextVe
 					coalesce((
 						SELECT version + 1
 						FROM objects
-						WHERE project_id = $1 AND bucket_name = $2 AND object_key = $3
+						WHERE (project_id, bucket_name, object_key) = ($1, $2, $3)
 						ORDER BY version DESC
 						LIMIT 1
 					), 1),
@@ -282,34 +282,31 @@ func (db *DB) BeginSegment(ctx context.Context, opts BeginSegment) (err error) {
 	//       however, we should prevent creating segements for non-partial objects.
 
 	// Verify that object exists and is partial.
-	var value int
+	var exists bool
 	if opts.UsePendingObjectsTable {
 		err = db.db.QueryRowContext(ctx, `
-			SELECT 1
-			FROM pending_objects WHERE
-				project_id   = $1 AND
-				bucket_name  = $2 AND
-				object_key   = $3 AND
-				stream_id    = $4
-		`, opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.StreamID).Scan(&value)
+			SELECT EXISTS (
+				SELECT 1
+				FROM pending_objects
+				WHERE (project_id, bucket_name, object_key, stream_id) = ($1, $2, $3, $4)
+			)
+		`, opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.StreamID).Scan(&exists)
 	} else {
 		err = db.db.QueryRowContext(ctx, `
-			SELECT 1
-			FROM objects WHERE
-				project_id   = $1 AND
-				bucket_name  = $2 AND
-				object_key   = $3 AND
-				version      = $4 AND
-				stream_id    = $5 AND
-				status       = `+statusPending,
-			opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.Version, opts.StreamID).Scan(&value)
+			SELECT EXISTS (
+				SELECT 1
+				FROM objects
+				WHERE (project_id, bucket_name, object_key, version, stream_id) = ($1, $2, $3, $4, $5) AND
+					status = `+statusPending+`
+			)`,
+			opts.ProjectID, []byte(opts.BucketName), opts.ObjectKey, opts.Version, opts.StreamID).Scan(&exists)
 	}
 	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return ErrPendingObjectMissing.New("")
-		}
 		return Error.New("unable to query object status: %w", err)
 	}
+	if !exists {
+		return ErrPendingObjectMissing.New("")
+	}
 
 	mon.Meter("segment_begin").Mark(1)
 
@@ -393,12 +390,10 @@ func (db *DB) CommitSegment(ctx context.Context, opts CommitSegment) (err error)
 				remote_alias_pieces,
 				placement
 			) VALUES (
-				(SELECT stream_id
-					FROM pending_objects WHERE
-						project_id   = $12 AND
-						bucket_name  = $13 AND
-						object_key   = $14 AND
-						stream_id    = $15
+				(
+					SELECT stream_id
+					FROM pending_objects
+					WHERE (project_id, bucket_name, object_key, stream_id) = ($12, $13, $14, $15)
 				), $1, $2,
 				$3, $4, $5,
 				$6, $7, $8, $9,
@@ -432,15 +427,12 @@ func (db *DB) CommitSegment(ctx context.Context, opts CommitSegment) (err error)
 				remote_alias_pieces,
 				placement
 			) VALUES (
-				(SELECT stream_id
-					FROM objects WHERE
-						project_id   = $12 AND
-						bucket_name  = $13 AND
-						object_key   = $14 AND
-						version      = $15 AND
-						stream_id    = $16 AND
-						status       = `+statusPending+
-			`	), $1, $2,
+				(
+					SELECT stream_id
+					FROM objects
+					WHERE (project_id, bucket_name, object_key, version, stream_id) = ($12, $13, $14, $15, $16) AND
+						status = `+statusPending+`
+				), $1, $2,
 				$3, $4, $5,
 				$6, $7, $8, $9,
 				$10,
@@ -527,12 +519,10 @@ func (db *DB) CommitInlineSegment(ctx context.Context, opts CommitInlineSegment)
 				encrypted_size, plain_offset, plain_size, encrypted_etag,
 				inline_data
 			) VALUES (
-				(SELECT stream_id
-					FROM pending_objects WHERE
-						project_id   = $11 AND
-						bucket_name  = $12 AND
-						object_key   = $13 AND
-						stream_id    = $14
+				(
+					SELECT stream_id
+					FROM pending_objects
+					WHERE (project_id, bucket_name, object_key, stream_id) = ($11, $12, $13, $14)
 				), $1, $2,
 				$3, $4, $5,
 				$6, $7, $8, $9,
@@ -558,15 +548,13 @@ func (db *DB) CommitInlineSegment(ctx context.Context, opts CommitInlineSegment)
 						encrypted_size, plain_offset, plain_size, encrypted_etag,
 						inline_data
 					) VALUES (
-						(SELECT stream_id
-							FROM objects WHERE
-								project_id   = $11 AND
-								bucket_name  = $12 AND
-								object_key   = $13 AND
-								version      = $14 AND
-								stream_id    = $15 AND
-								status       = `+statusPending+
-			`	), $1, $2,
+						(
+							SELECT stream_id
+							FROM objects
+							WHERE (project_id, bucket_name, object_key, version, stream_id) = ($11, $12, $13, $14, $15) AND
+								status = `+statusPending+`
+						),
+						$1, $2,
 						$3, $4, $5,
 						$6, $7, $8, $9,
 						$10
@@ -737,11 +725,8 @@ func (db *DB) CommitObject(ctx context.Context, opts CommitObject) (object Objec
 
 			err = tx.QueryRowContext(ctx, `
 				WITH delete_pending_object AS (
-					DELETE FROM pending_objects WHERE
-						project_id   = $1 AND
-						bucket_name  = $2 AND
-						object_key   = $3 AND
-						stream_id    = $5
+					DELETE FROM pending_objects
+					WHERE (project_id, bucket_name, object_key, stream_id) = ($1, $2, $3, $5)
 					RETURNING expires_at, encryption, encrypted_metadata_nonce, encrypted_metadata, encrypted_metadata_encrypted_key
 				)
 				INSERT INTO objects (
@@ -829,12 +814,7 @@ func (db *DB) CommitObject(ctx context.Context, opts CommitObject) (object Objec
 						ELSE objects.encryption
 					END
 					`+metadataColumns+`
-				WHERE
-					project_id   = $1 AND
-					bucket_name  = $2 AND
-					object_key   = $3 AND
-					version      = $4 AND
-					stream_id    = $5 AND
+				WHERE (project_id, bucket_name, object_key, version, stream_id) = ($1, $2, $3, $4, $5) AND
 					status       = `+statusPending+`
 				RETURNING
 					created_at, expires_at,
diff --git a/satellite/metabase/commit_object.go b/satellite/metabase/commit_object.go
index ef3116618..c5568e6b8 100644
--- a/satellite/metabase/commit_object.go
+++ b/satellite/metabase/commit_object.go
@@ -127,13 +127,8 @@ func (db *DB) CommitObjectWithSegments(ctx context.Context, opts CommitObjectWit
 				total_encrypted_size = $12,
 				fixed_segment_size   = $13,
 				zombie_deletion_deadline = NULL
-			WHERE
-				project_id   = $1 AND
-				bucket_name  = $2 AND
-				object_key   = $3 AND
-				version      = $4 AND
-				stream_id    = $5 AND
-				status       = `+statusPending+`
+			WHERE (project_id, bucket_name, object_key, version, stream_id) = ($1, $2, $3, $4, $5) AND
+				status = `+statusPending+`
 			RETURNING
 				created_at, expires_at,
 				encryption;
diff --git a/satellite/metabase/delete.go b/satellite/metabase/delete.go
index 2d8a75757..f96855c04 100644
--- a/satellite/metabase/delete.go
+++ b/satellite/metabase/delete.go
@@ -169,12 +169,8 @@ func (db *DB) DeletePendingObject(ctx context.Context, opts DeletePendingObject)
 			WITH deleted_objects AS (
 				DELETE FROM objects
 				WHERE
-					project_id   = $1 AND
-					bucket_name  = $2 AND
-					object_key   = $3 AND
-					version      = $4 AND
-					stream_id    = $5 AND
-					status       = `+statusPending+`
+					(project_id, bucket_name, object_key, version, stream_id) = ($1, $2, $3, $4, $5) AND
+					status = `+statusPending+`
 				RETURNING
 					version, stream_id, created_at, expires_at, status, segment_count,
 					encrypted_metadata_nonce, encrypted_metadata, encrypted_metadata_encrypted_key,
@@ -223,10 +219,7 @@ func (db *DB) DeletePendingObjectNew(ctx context.Context, opts DeletePendingObje
 			WITH deleted_objects AS (
 				DELETE FROM pending_objects
 				WHERE
-					project_id   = $1 AND
-					bucket_name  = $2 AND
-					object_key   = $3 AND
-					stream_id    = $4
+					(project_id, bucket_name, object_key, stream_id) = ($1, $2, $3, $4)
 				RETURNING
 					stream_id, created_at, expires_at,
 					encrypted_metadata_nonce, encrypted_metadata, encrypted_metadata_encrypted_key,
diff --git a/satellite/metabase/delete_bucket.go b/satellite/metabase/delete_bucket.go
index b0191a32a..5db07278c 100644
--- a/satellite/metabase/delete_bucket.go
+++ b/satellite/metabase/delete_bucket.go
@@ -74,7 +74,8 @@ func (db *DB) deleteBucketObjects(ctx context.Context, opts DeleteBucketObjects)
 		query = `
 		WITH deleted_objects AS (
 			DELETE FROM objects
-			WHERE project_id = $1 AND bucket_name = $2 LIMIT $3
+			WHERE (project_id, bucket_name) = ($1, $2)
+			LIMIT $3
 			RETURNING objects.stream_id, objects.segment_count
 		), deleted_segments AS (
 			DELETE FROM segments
@@ -89,7 +90,7 @@ func (db *DB) deleteBucketObjects(ctx context.Context, opts DeleteBucketObjects)
 			DELETE FROM objects
 			WHERE stream_id IN (
 				SELECT stream_id FROM objects
-				WHERE project_id = $1 AND bucket_name = $2
+				WHERE (project_id, bucket_name) = ($1, $2)
 				LIMIT $3
 			)
 			RETURNING objects.stream_id, objects.segment_count
@@ -127,7 +128,8 @@ func (db *DB) deleteBucketPendingObjects(ctx context.Context, opts DeleteBucketO
 		query = `
 		WITH deleted_objects AS (
 			DELETE FROM pending_objects
-			WHERE project_id = $1 AND bucket_name = $2 LIMIT $3
+			WHERE (project_id, bucket_name) = ($1, $2)
+			LIMIT $3
 			RETURNING pending_objects.stream_id
 		), deleted_segments AS (
 			DELETE FROM segments
@@ -142,7 +144,7 @@ func (db *DB) deleteBucketPendingObjects(ctx context.Context, opts DeleteBucketO
 			DELETE FROM pending_objects
 			WHERE stream_id IN (
 				SELECT stream_id FROM pending_objects
-				WHERE project_id = $1 AND bucket_name = $2
+				WHERE (project_id, bucket_name) = ($1, $2)
 				LIMIT $3
 			)
 			RETURNING pending_objects.stream_id
diff --git a/satellite/metabase/metadata.go b/satellite/metabase/metadata.go
index 43ca7e9c8..8ed48cf31 100644
--- a/satellite/metabase/metadata.go
+++ b/satellite/metabase/metadata.go
@@ -57,14 +57,10 @@ func (db *DB) UpdateObjectMetadata(ctx context.Context, opts UpdateObjectMetadat
 			encrypted_metadata               = $6,
 			encrypted_metadata_encrypted_key = $7
 		WHERE
-			project_id   = $1 AND
-			bucket_name  = $2 AND
-			object_key   = $3 AND
+			(project_id, bucket_name, object_key) = ($1, $2, $3) AND
 			version IN (SELECT version FROM objects WHERE
-				project_id   = $1 AND
-				bucket_name  = $2 AND
-				object_key   = $3 AND
-				status       = `+statusCommittedUnversioned+` AND
+				(project_id, bucket_name, object_key) = ($1, $2, $3) AND
+				status = `+statusCommittedUnversioned+` AND
 				(expires_at IS NULL OR expires_at > now())
 				ORDER BY version desc
 			) AND
diff --git a/satellite/metabase/pending_objects_iterator.go b/satellite/metabase/pending_objects_iterator.go
index c464d5a32..53f53b61f 100644
--- a/satellite/metabase/pending_objects_iterator.go
+++ b/satellite/metabase/pending_objects_iterator.go
@@ -367,9 +367,8 @@ func doNextQueryPendingStreamsByKey(ctx context.Context, it *pendingObjectsItera
 				encrypted_metadata_nonce, encrypted_metadata, encrypted_metadata_encrypted_key
 			FROM pending_objects
 			WHERE
-				project_id = $1 AND bucket_name = $2
-				AND object_key = $3
-				AND stream_id > $4::BYTEA
+				(project_id, bucket_name, object_key) = ($1, $2, $3) AND
+				stream_id > $4::BYTEA
 			ORDER BY stream_id ASC
 			LIMIT $5
 			`, it.projectID, it.bucketName,