diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMiningProvider.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMiningProvider.java
index 29b6071fa9b..ab97c258d22 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMiningProvider.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/codemining/ZeroWidthCharactersLineContentCodeMiningProvider.java
@@ -93,7 +93,10 @@ private void updateCodeMinings() {
 
 	@Override
 	public void dispose() {
-		store.removePropertyChangeListener(this);
+		if (store != null) {
+			store.removePropertyChangeListener(this);
+			store = null;
+		}
 		super.dispose();
 	}