diff --git a/src/barebox-state.c b/src/barebox-state.c
index e68b8cb..ff318b2 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -522,9 +522,9 @@
 		exit(1);
 	}
 
-	ret = flock(lock_fd, LOCK_EX | LOCK_NB);
+	ret = flock(lock_fd, LOCK_EX);
 	if (ret < 0) {
-		pr_err("Failed to lock. Already locked by other process /var/lock/barebox-state.\n");
+		pr_err("Failed to lock /var/lock/barebox-state: %m\n");
 		close(lock_fd);
 		exit(1);
 	}