diff --git a/master/ethernet.c b/master/ethernet.c
index 089c8aec..55cff311 100644
--- a/master/ethernet.c
+++ b/master/ethernet.c
@@ -792,7 +792,6 @@ int ec_eoedev_open(struct net_device *dev /**< EoE net_device */)
 #if EOE_DEBUG_LEVEL >= 2
     EC_SLAVE_DBG(eoe->slave, 0, "%s opened.\n", dev->name);
 #endif
-    ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP);
     return 0;
 }
 
@@ -814,7 +813,6 @@ int ec_eoedev_stop(struct net_device *dev /**< EoE net_device */)
 #if EOE_DEBUG_LEVEL >= 2
     EC_SLAVE_DBG(eoe->slave, 0, "%s stopped.\n", dev->name);
 #endif
-    ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_PREOP);
     return 0;
 }
 
diff --git a/master/master.c b/master/master.c
index 77f646f1..9b9f005d 100644
--- a/master/master.c
+++ b/master/master.c
@@ -703,9 +703,6 @@ int ec_master_enter_operation_phase(
 {
     int ret = 0;
     ec_slave_t *slave;
-#ifdef EC_EOE
-    ec_eoe_t *eoe;
-#endif
 
     EC_MASTER_DBG(master, 1, "IDLE -> OPERATION.\n");
 
@@ -755,14 +752,6 @@ int ec_master_enter_operation_phase(
         ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP);
     }
 
-#ifdef EC_EOE
-    // ... but set EoE slaves to OP
-    list_for_each_entry(eoe, &master->eoe_handlers, list) {
-        if (ec_eoe_is_open(eoe))
-            ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP);
-    }
-#endif
-
     master->phase = EC_OPERATION;
     master->app_send_cb = NULL;
     master->app_receive_cb = NULL;