diff --git a/Iceberg/IceSystemEventListener.class.st b/Iceberg/IceSystemEventListener.class.st
index a9a85995d5..3ee9ba5291 100644
--- a/Iceberg/IceSystemEventListener.class.st
+++ b/Iceberg/IceSystemEventListener.class.st
@@ -79,15 +79,18 @@ IceSystemEventListener class >> initialize [
 IceSystemEventListener class >> registerSystemAnnouncements [
 
 	self unregisterSystemAnnouncements.
-	SystemAnnouncer uniqueInstance weak
+
+	self codeChangeAnnouncer weak
 		when: ClassAnnouncement send: #handleClassChange: to: self;
 		when: MethodAnnouncement send: #handleMethodChange: to: self;
-		when: PackageTagAnnouncement send: #handlePackageChange: to: self;
-		when: MCVersionLoaderStopped send: #handleVersionLoaded: to: self.
+		when: PackageTagAnnouncement send: #handlePackageChange: to: self.
+
+	self codeSupportAnnouncer weak when: MCVersionLoaderStopped send: #handleVersionLoaded: to: self
 ]
 
 { #category : 'class initialization' }
 IceSystemEventListener class >> unregisterSystemAnnouncements [
-	
-	SystemAnnouncer uniqueInstance unsubscribe: self
+
+	self codeSupportAnnouncer unsubscribe: self.
+	self codeChangeAnnouncer unsubscribe: self
 ]