diff --git a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
index 75af35139431..c75bdd1ac519 100644
--- a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
+++ b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
@@ -116,7 +116,7 @@ final class MessageBusConnectionImpl implements MessageBusConnection {
     final Message messageOnLocalQueue = myPendingMessages.get().poll();
     assert messageOnLocalQueue == message;
 
-    final Topic topic = message.getTopic();
+    Topic<?> topic = message.getTopic();
     Object handler = mySubscriptions.get(topic);
     try {
       if (handler == myDefaultHandler) {
@@ -154,7 +154,7 @@ final class MessageBusConnectionImpl implements MessageBusConnection {
     myPendingMessages.get().offer(message);
   }
 
-  boolean containsMessage(@NotNull Topic topic) {
+  boolean containsMessage(@NotNull Topic<?> topic) {
     Queue<Message> pendingMessages = myPendingMessages.get();
     if (pendingMessages.isEmpty()) return false;
 
diff --git a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
index 30e7ae9b9f60..47a29fbe5a58 100644
--- a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
+++ b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
@@ -38,17 +38,17 @@ public class MessageBusImpl implements MessageBus {
    */
   private final int[] myOrder;
 
-  private final ConcurrentMap<Topic, Object> myPublishers = ContainerUtil.newConcurrentMap();
+  private final ConcurrentMap<Topic<?>, Object> myPublishers = ContainerUtil.newConcurrentMap();
 
   /**
    * This bus's subscribers
    */
-  private final ConcurrentMap<Topic, List<MessageBusConnectionImpl>> mySubscribers = ContainerUtil.newConcurrentMap();
+  private final ConcurrentMap<Topic<?>, List<MessageBusConnectionImpl>> mySubscribers = ContainerUtil.newConcurrentMap();
 
   /**
    * Caches subscribers for this bus and its children or parent, depending on the topic's broadcast policy
    */
-  private final Map<Topic, List<MessageBusConnectionImpl>> mySubscriberCache = ContainerUtil.newConcurrentMap();
+  private final Map<Topic<?>, List<MessageBusConnectionImpl>> mySubscriberCache = ContainerUtil.newConcurrentMap();
   private final List<MessageBusImpl> myChildBuses = ContainerUtil.createLockFreeCopyOnWriteList();
 
   @NotNull
@@ -296,7 +296,7 @@ public class MessageBusImpl implements MessageBus {
     return myOwner;
   }
 
-  private void calcSubscribers(@NotNull Topic topic, @NotNull List<? super MessageBusConnectionImpl> result) {
+  private void calcSubscribers(@NotNull Topic<?> topic, @NotNull List<? super MessageBusConnectionImpl> result) {
     final List<MessageBusConnectionImpl> topicSubscribers = mySubscribers.get(topic);
     if (topicSubscribers != null) {
       result.addAll(topicSubscribers);
@@ -328,7 +328,7 @@ public class MessageBusImpl implements MessageBus {
   }
 
   @NotNull
-  private List<MessageBusConnectionImpl> getTopicSubscribers(@NotNull Topic topic) {
+  private List<MessageBusConnectionImpl> getTopicSubscribers(@NotNull Topic<?> topic) {
     List<MessageBusConnectionImpl> topicSubscribers = mySubscriberCache.get(topic);
     if (topicSubscribers == null) {
       topicSubscribers = new SmartList<>();