diff --git a/core/commands/pin.go b/core/commands/pin.go
index 33258b832..d1beecefd 100644
--- a/core/commands/pin.go
+++ b/core/commands/pin.go
@@ -60,11 +60,6 @@ on disk.
 			recursive = false
 		}
 
-		go func() {
-			<-req.Context().Done()
-			log.Error("CONTEXT IS OVER!")
-		}()
-
 		added, err := corerepo.Pin(n, req.Context(), req.Arguments(), recursive)
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)
diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh
index b113eb5dd..1d3b02ac7 100755
--- a/test/sharness/t0081-repo-pinning.sh
+++ b/test/sharness/t0081-repo-pinning.sh
@@ -243,7 +243,8 @@ test_expect_success "some are no longer there" '
 test_expect_success "recursive pin fails without objects" '
 	ipfs pin rm "$HASH_DIR1" &&
 	test_must_fail ipfs pin add -r "$HASH_DIR1" --timeout=500ms 2>err_expected8 &&
-	grep "context deadline exceeded" err_expected8
+	grep "context deadline exceeded" err_expected8 ||
+	test_fsh cat err_expected8
 '
 
 # test_kill_ipfs_daemon