diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 30a30b7b301c..93f2c1348add 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1401,7 +1401,7 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
 			schedule_delayed_work(&hdev->service_cache,
 					msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));
 
-		goto unlock;
+		goto update_class;
 	}
 
 	found = 0;
@@ -1422,6 +1422,7 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
 		goto unlock;
 	}
 
+update_class:
 	err = update_class(hdev);
 	if (err < 0)
 		goto unlock;