diff --git a/src/lombokSupport.ts b/src/lombokSupport.ts
index b61e776499..857bae8942 100644
--- a/src/lombokSupport.ts
+++ b/src/lombokSupport.ts
@@ -133,17 +133,14 @@ export async function checkLombokDependency(context: ExtensionContext) {
 		for (const classpath of classpathResult.classpaths) {
 			if (lombokJarRegex.test(classpath)) {
 				currentLombokClasspath = classpath;
-				if (context.workspaceState.get(JAVA_LOMBOK_PATH)) {
+				if (activeLombokPath && !isExtensionLombok) {
 					currentLombokVersion = lombokJarRegex.exec(classpath)[0];
-					previousLombokVersion = lombokJarRegex.exec(context.workspaceState.get(JAVA_LOMBOK_PATH))[0];
+					previousLombokVersion = lombokJarRegex.exec(activeLombokPath)[0];
 					if (currentLombokVersion !== previousLombokVersion) {
 						needReload = true;
 						versionChange = true;
 					}
 				}
-				else {
-					needReload = true;
-				}
 				lombokFound = true;
 				break;
 			}
@@ -167,6 +164,7 @@ export async function checkLombokDependency(context: ExtensionContext) {
 	if (isLombokStatusBarInitialized && !projectLombokPath) {
 		runtimeStatusBarProvider.destroyLombokStatusBar();
 		isLombokStatusBarInitialized = false;
+		cleanupLombokCache(context);
 	}
 	if (needReload && !isExtensionLombok) {
 		if (versionChange) {