diff --git a/pkg/system/rm.go b/pkg/system/rm.go
index 02e4d26221..b310991800 100644
--- a/pkg/system/rm.go
+++ b/pkg/system/rm.go
@@ -34,7 +34,7 @@ func EnsureRemoveAll(dir string) error {
 	for {
 		err := os.RemoveAll(dir)
 		if err == nil {
-			return err
+			return nil
 		}
 
 		pe, ok := err.(*os.PathError)