diff --git a/shared/microwave_state.py b/shared/microwave_state.py
index a019538..c6f6bff 100644
--- a/shared/microwave_state.py
+++ b/shared/microwave_state.py
@@ -62,6 +62,8 @@ class MicrowaveState:
             ), "Invalid cooking state: " + str(new_cooking_state)
             
         if self.cooking_state != new_cooking_state:
+            if self.cooking_state == CookingStates.COOKING and new_cooking_state == CookingStates.DONE:
+                self.set_state(MicrowaveState.DONE)
             self.cooking_state = new_cooking_state
             self._notify_change(MicrowaveStateFields.COOKING_STATE)