diff --git a/share/availability/full/availability.go b/share/availability/full/availability.go
index cfa5bd0c39..4b19183be1 100644
--- a/share/availability/full/availability.go
+++ b/share/availability/full/availability.go
@@ -72,13 +72,14 @@ func (fa *ShareAvailability) SharesAvailable(ctx context.Context, root *share.Ro
 
 	_, err := fa.getter.GetEDS(ctx, root)
 	if err != nil {
+		if errors.Is(err, context.Canceled) {
+			return err
+		}
 		log.Errorw("availability validation failed", "root", root.String(), "err", err.Error())
 		var byzantineErr *byzantine.ErrByzantine
 		if ipldFormat.IsNotFound(err) || errors.Is(err, context.DeadlineExceeded) && !errors.As(err, &byzantineErr) {
 			return share.ErrNotAvailable
 		}
-
-		return err
 	}
 	return err
 }
diff --git a/share/availability/light/availability.go b/share/availability/light/availability.go
index 761671b955..cc2e08129e 100644
--- a/share/availability/light/availability.go
+++ b/share/availability/light/availability.go
@@ -84,13 +84,13 @@ func (la *ShareAvailability) SharesAvailable(ctx context.Context, dah *share.Roo
 		}
 
 		if err != nil {
-			if !errors.Is(err, context.Canceled) {
-				log.Errorw("availability validation failed", "root", dah.String(), "err", err.Error())
+			if errors.Is(err, context.Canceled) {
+				return err
 			}
+			log.Errorw("availability validation failed", "root", dah.String(), "err", err.Error())
 			if ipldFormat.IsNotFound(err) || errors.Is(err, context.DeadlineExceeded) {
 				return share.ErrNotAvailable
 			}
-
 			return err
 		}
 	}