diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb3f61ff9a..f3d2e299df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved animations by adding orientation variation
 - new tail bone for quad_small body
 - slim the game size through lossless asset optimization
+- Lanterns now stop glowing if you throw a lit one out of your inventory
 
 ### Removed
 
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 4593e94c22..fb4fd12f8a 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -688,7 +688,15 @@ impl PlayState for SessionState {
                     },
                     HudEvent::UseSlot(x) => self.client.borrow_mut().use_slot(x),
                     HudEvent::SwapSlots(a, b) => self.client.borrow_mut().swap_slots(a, b),
-                    HudEvent::DropSlot(x) => self.client.borrow_mut().drop_slot(x),
+                    HudEvent::DropSlot(x) => {
+                        let mut client = self.client.borrow_mut();
+                        client.drop_slot(x);
+                        if let comp::slot::Slot::Equip(equip_slot) = x {
+                            if let comp::slot::EquipSlot::Lantern = equip_slot {
+                                client.toggle_lantern();
+                            }
+                        }
+                    },
                     HudEvent::Ability3(state) => self.inputs.ability3.set_state(state),
                     HudEvent::ChangeFOV(new_fov) => {
                         global_state.settings.graphics.fov = new_fov;