1 files changed, 3 insertions, 1 deletions

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 979f8f21b7e2..881bbe5e1827 100644
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -1158,8 +1158,10 @@ bool __bfq_deactivate_entity(struct bfq_entity *entity, bool ins_into_idle_tree)
         st = bfq_entity_service_tree(entity);
         is_in_service = entity == sd->in_service_entity;
 
-        if (is_in_service)
+        if (is_in_service) {
                 bfq_calc_finish(entity, entity->service);
+                sd->in_service_entity = NULL;
+        }
 
         if (entity->tree == &st->active)
                 bfq_active_extract(st, entity);