diff --git a/cmd/ipfs/ulimit_unix.go b/cmd/ipfs/ulimit_unix.go
index c2c24b787..b4f2a6c7d 100644
--- a/cmd/ipfs/ulimit_unix.go
+++ b/cmd/ipfs/ulimit_unix.go
@@ -31,14 +31,11 @@ func checkAndSetUlimit() error {
 	}
 
 	if rLimit.Cur < ipfsFileDescNum {
-		if rLimit.Max > ipfsFileDescNum {
-			fmt.Printf("Adjusting current ulimit to %d.\n", rLimit.Max)
-			rLimit.Cur = rLimit.Max
-		} else {
-			fmt.Printf("Adjusting current and maximum ulimit to %d.\n", ipfsFileDescNum)
-			rLimit.Cur = ipfsFileDescNum
+		if rLimit.Max < ipfsFileDescNum {
 			rLimit.Max = ipfsFileDescNum
 		}
+		fmt.Printf("Adjusting current ulimit to %d.\n", ipfsFileDescNum)
+		rLimit.Cur = ipfsFileDescNum
 	}
 
 	err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)