diff --git a/src/directory.c b/src/directory.c
index a3efdf15e..9c8bd23fa 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -968,7 +968,7 @@ int writeDirectoryDB(void)
 
 	DEBUG("writing DB\n");
 
-	while (!(fp = fopen(dbFile, "w")) && errno == EINTR);
+	fp = fopen(dbFile, "w");
 	if (!fp) {
 		ERROR("unable to write to db file \"%s\": %s\n",
 		      dbFile, strerror(errno));
diff --git a/src/state_file.c b/src/state_file.c
index 3bc4f8f0c..2ce5e66b4 100644
--- a/src/state_file.c
+++ b/src/state_file.c
@@ -55,8 +55,7 @@ void write_state_file(void)
 
 	if (!sfpath)
 		return;
-	while (!(fp = fopen(sfpath, "w")) && errno == EINTR);
-
+	fp = fopen(sfpath, "w");
 	if (mpd_unlikely(!fp)) {
 		ERROR("problems opening state file \"%s\" for writing: %s\n",
 		      sfpath, strerror(errno));