diff --git a/cache/disk/disk.go b/cache/disk/disk.go
index b0557ceab..395d109cc 100644
--- a/cache/disk/disk.go
+++ b/cache/disk/disk.go
@@ -1181,7 +1181,8 @@ func (c *diskCache) GetValidatedActionResult(ctx context.Context, hash string) (
 	err = c.findMissingCasBlobsInternal(ctx, pendingValidations, true)
 	if errors.Is(err, errMissingBlob) {
 		return nil, nil, nil // aka "not found"
-	} else if err != nil {
+	}
+	if err != nil {
 		return nil, nil, err
 	}
 
diff --git a/cache/disk/findmissing.go b/cache/disk/findmissing.go
index a099851d2..8cd83abd1 100644
--- a/cache/disk/findmissing.go
+++ b/cache/disk/findmissing.go
@@ -91,7 +91,9 @@ func (c *diskCache) findMissingCasBlobsInternal(ctx context.Context, blobs []*pb
 		if c.proxy == nil && failFast {
 			// There's no proxy, there are missing blobs from the local cache, and we are failing fast.
 			return errMissingBlob
-		} else if c.proxy != nil {
+		}
+
+		if c.proxy != nil {
 			for i := range chunk {
 				if chunk[i] == nil {
 					continue