diff --git a/pkg/file/joiner/joiner_test.go b/pkg/file/joiner/joiner_test.go
index 7144c6e7643..bfb6e4d2cd6 100644
--- a/pkg/file/joiner/joiner_test.go
+++ b/pkg/file/joiner/joiner_test.go
@@ -32,7 +32,6 @@ import (
 	"github.com/ethersphere/bee/pkg/swarm"
 	"github.com/ethersphere/bee/pkg/util/testutil"
 	"github.com/ethersphere/bee/pkg/util/testutil/pseudorand"
-	"github.com/ethersphere/bee/pkg/util/testutil/racedetection"
 	"gitlab.com/nolash/go-mockbytes"
 	"golang.org/x/sync/errgroup"
 )
@@ -1253,10 +1252,6 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
 		canReadRange := func(t *testing.T, s getter.Strategy, fallback bool, levels int, canRead bool) {
 			ctx := context.Background()
 			strategyTimeout := 100 * time.Millisecond
-			decodingTimeout := 600 * time.Millisecond
-			if racedetection.IsOn() {
-				decodingTimeout *= 2
-			}
 
 			strategyTimeoutStr := strategyTimeout.String()
 			decodingTimeoutStr := (2 * strategyTimeout).String()
@@ -1266,8 +1261,6 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			ctx, cancel := context.WithTimeout(ctx, time.Duration(levels)*(3*strategyTimeout+decodingTimeout))
-			defer cancel()
 			j, _, err := joiner.New(ctx, store, store, addr)
 			if err != nil {
 				t.Fatal(err)
diff --git a/pkg/file/redundancy/getter/getter.go b/pkg/file/redundancy/getter/getter.go
index 56d0cd028f0..bc2828e38bc 100644
--- a/pkg/file/redundancy/getter/getter.go
+++ b/pkg/file/redundancy/getter/getter.go
@@ -145,17 +145,17 @@ func (g *decoder) fetch(ctx context.Context, i int, waitForRecovery bool) (err e
 		g.wg.Add(1)
 		defer g.wg.Done()
 
-		defer close(g.waits[i])
-
 		// retrieval
 		ch, err := g.fetcher.Get(fctx, g.addrs[i])
 		if err != nil {
 			g.failedCnt.Add(1)
+			close(g.waits[i])
 			return waitRecovery(err)
 		}
 
 		g.fetchedCnt.Add(1)
 		g.setData(i, ch.Data())
+		close(g.waits[i])
 		return nil
 	}