diff --git a/tm4c123x-hal/src/eeprom.rs b/tm4c123x-hal/src/eeprom.rs
index 3e7438e..bf67b46 100644
--- a/tm4c123x-hal/src/eeprom.rs
+++ b/tm4c123x-hal/src/eeprom.rs
@@ -142,10 +142,7 @@ impl Eeprom {
 
     /// Set the block and offset registers
     fn set_block_and_offset(&self, address: &EepromAddress) -> Result<(), EepromError> {
-        if self.is_busy() {
-            return Err(EepromError::Busy);
-        }
-
+        self.wait();
         self.set_block(address.block())?;
         self.set_offset(address.offset())?;
         Ok(())