diff --git a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
index ab181f68478d..9220532ddd4c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+++ b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
@@ -35,7 +35,7 @@ import java.util.Set;
  *
  * @author nik
  */
-public class ClipboardSynchronizer implements Disposable {
+public final class ClipboardSynchronizer implements Disposable {
   private static final Logger LOG = Logger.getInstance(ClipboardSynchronizer.class);
 
   private final ClipboardHandler myClipboardHandler;
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index e5cd3f41a4c7..0e3b8e218336 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -23,6 +23,7 @@
                         serviceImplementation="com.intellij.history.integration.LocalHistoryImpl" preload="true"/>
 
     <applicationService serviceImplementation="com.intellij.util.net.HttpConfigurable" preload="true"/>
+    <applicationService serviceImplementation="com.intellij.ide.ClipboardSynchronizer" preload="true"/>
     <applicationService serviceInterface="com.intellij.openapi.keymap.KeymapManager"
                         serviceImplementation="com.intellij.openapi.keymap.impl.KeymapManagerImpl"/>
 
diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index 34002c7d5944..862e4c163101 100644
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -54,10 +54,6 @@
       <implementation-class>com.intellij.notification.impl.NotificationsManagerImpl</implementation-class>
     </component>
 
-    <component>
-      <implementation-class>com.intellij.ide.ClipboardSynchronizer</implementation-class>
-    </component>
-
     <component>
       <implementation-class>com.intellij.openapi.util.FoundationLoader</implementation-class>
       <headless-implementation-class/>