diff --git a/master/fsm_master.c b/master/fsm_master.c
index 25ace7368c3c34a9be23ad946268620368726abc..b0525b7afd6ca3e1bbb05802e1a5c903f623809c 100644
--- a/master/fsm_master.c
+++ b/master/fsm_master.c
@@ -298,6 +298,7 @@ int ec_fsm_master_action_process_eeprom(
         request = list_entry(master->eeprom_requests.next,
                 ec_eeprom_write_request_t, list);
         list_del_init(&request->list); // dequeue
+        request->state = EC_EEPROM_REQ_BUSY;
         up(&master->eeprom_sem);
 
         slave = request->slave;
@@ -305,7 +306,7 @@ int ec_fsm_master_action_process_eeprom(
             EC_ERR("Discarding EEPROM data, slave %i not ready.\n",
                     slave->ring_position);
             request->state = EC_EEPROM_REQ_ERROR;
-            wake_up_interruptible(&master->eeprom_queue);
+            wake_up(&master->eeprom_queue);
             continue;
         }
 
@@ -794,7 +795,7 @@ void ec_fsm_master_state_write_eeprom(ec_fsm_master_t *fsm /**< master state mac
         EC_ERR("Failed to write EEPROM contents to slave %i.\n",
                slave->ring_position);
         request->state = EC_EEPROM_REQ_ERROR;
-        wake_up_interruptible(&master->eeprom_queue);
+        wake_up(&master->eeprom_queue);
         fsm->state = ec_fsm_master_state_error;
         return;
     }
@@ -812,7 +813,7 @@ void ec_fsm_master_state_write_eeprom(ec_fsm_master_t *fsm /**< master state mac
     // finished writing EEPROM
     EC_INFO("Finished writing EEPROM of slave %i.\n", slave->ring_position);
     request->state = EC_EEPROM_REQ_COMPLETED;
-    wake_up_interruptible(&master->eeprom_queue);
+    wake_up(&master->eeprom_queue);
 
     // TODO: Evaluate new EEPROM contents!
 
diff --git a/master/fsm_master.h b/master/fsm_master.h
index ad5399d6dc02e72b18b67d30b2483d7c62f56aeb..1080b20685873f9ab5dd0a267a61af6430d43e1d 100644
--- a/master/fsm_master.h
+++ b/master/fsm_master.h
@@ -58,6 +58,7 @@
 typedef enum
 {
     EC_EEPROM_REQ_QUEUED,
+    EC_EEPROM_REQ_BUSY,
     EC_EEPROM_REQ_COMPLETED,
     EC_EEPROM_REQ_ERROR
 }
diff --git a/master/slave.c b/master/slave.c
index 74ecf7d103bfa5d7d5050873b057865a354bf918..07db78a7283aef95ec8e60625777778e751c9e24 100644
--- a/master/slave.c
+++ b/master/slave.c
@@ -832,20 +832,21 @@ ssize_t ec_slave_write_eeprom(ec_slave_t *slave, /**< EtherCAT slave */
     up(&master->eeprom_sem);
 
     // wait for processing through FSM
-    while (wait_event_interruptible(master->eeprom_queue,
+    if (wait_event_interruptible(master->eeprom_queue,
                 request.state != EC_EEPROM_REQ_QUEUED)) {
         // interrupted by signal
         down(&master->eeprom_sem);
-        if (!list_empty(&request.list)) {
-            // still queued: safely dequeue
+        if (request.state == EC_EEPROM_REQ_QUEUED) {
             list_del(&request.list);
             up(&master->eeprom_sem);
-            return -EINTR;
+            return -EPERM;
         }
         // request processing: interrupt not possible.
         up(&master->eeprom_sem);
     }
 
+    wait_event(master->eeprom_queue, request.state != EC_EEPROM_REQ_BUSY);
+
     return request.state == EC_EEPROM_REQ_COMPLETED ? size : -EIO;
 }