diff --git a/platform/credential-store/src/PasswordSafeConfigurable.kt b/platform/credential-store/src/PasswordSafeConfigurable.kt
index 6fcf8afb4dfd..cb8210d54684 100644
--- a/platform/credential-store/src/PasswordSafeConfigurable.kt
+++ b/platform/credential-store/src/PasswordSafeConfigurable.kt
@@ -69,8 +69,4 @@ class PasswordSafeConfigurableUi : ConfigurableUi<PasswordSafeSettings> {
       return ProviderType.MASTER_PASSWORD
     }
   }
-}
-
-interface PasswordSafeSettingsListener {
-  fun typeChanged(oldValue: PasswordSafeSettings.ProviderType, newValue: PasswordSafeSettings.ProviderType)
 }
\ No newline at end of file
diff --git a/platform/credential-store/src/PasswordSafeImpl.kt b/platform/credential-store/src/PasswordSafeImpl.kt
index 21d5f526a75e..c935bcd78629 100644
--- a/platform/credential-store/src/PasswordSafeImpl.kt
+++ b/platform/credential-store/src/PasswordSafeImpl.kt
@@ -112,6 +112,8 @@ class PasswordSafeImpl(/* public - backward compatibility */val settings: Passwo
     finally {
       (currentProvider as? FileCredentialStore)?.let { it.clear() }
     }
+
+    ApplicationManager.getApplication().messageBus.syncPublisher(PasswordSafeSettings.TOPIC).credentialStoreCleared()
   }
 
   // public - backward compatibility
diff --git a/platform/credential-store/src/com/intellij/credentialStore/PasswordSafeSettingsListener.java b/platform/credential-store/src/com/intellij/credentialStore/PasswordSafeSettingsListener.java
new file mode 100644
index 000000000000..9146f2a4abc8
--- /dev/null
+++ b/platform/credential-store/src/com/intellij/credentialStore/PasswordSafeSettingsListener.java
@@ -0,0 +1,11 @@
+package com.intellij.credentialStore;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface PasswordSafeSettingsListener {
+  default void typeChanged(@NotNull PasswordSafeSettings.ProviderType oldValue, @NotNull PasswordSafeSettings.ProviderType newValue) {
+  }
+
+  default void credentialStoreCleared() {
+  }
+}
\ No newline at end of file