diff --git a/src/NewTools-SettingsBrowser-Tests/StSettingsTrackerTest.class.st b/src/NewTools-SettingsBrowser-Tests/StSettingsTrackerTest.class.st
index 9f2a0121..89cfb2ef 100644
--- a/src/NewTools-SettingsBrowser-Tests/StSettingsTrackerTest.class.st
+++ b/src/NewTools-SettingsBrowser-Tests/StSettingsTrackerTest.class.st
@@ -73,6 +73,7 @@ StSettingsTrackerTest >> submitPresenter: settingItem [
 StSettingsTrackerTest >> tearDown [
 
 	self class codeSupportAnnouncer unsubscribe: self.
+	"Clean SettingUpdated subscriptions"
 	(self class codeSupportAnnouncer subscriptions subscriptionsHandling: SettingUpdated new)
 		do: [ : s | self class codeSupportAnnouncer removeSubscription: s ].
 	tracker sessionLog ifNotEmpty: [ : collection | collection removeLast ].
diff --git a/src/NewTools-SettingsBrowser/StSettingsTracker.class.st b/src/NewTools-SettingsBrowser/StSettingsTracker.class.st
index 9384bde2..dcc16482 100644
--- a/src/NewTools-SettingsBrowser/StSettingsTracker.class.st
+++ b/src/NewTools-SettingsBrowser/StSettingsTracker.class.st
@@ -25,7 +25,10 @@ StSettingsTracker class >> reset [
 { #category : 'initialization' }
 StSettingsTracker class >> sessionLog [
 
-	^ SessionLog 
+	^ SessionLog
+		ifNil: [ 
+			self initialize.
+			SessionLog ]
 ]
 
 { #category : 'initialization' }
@@ -49,10 +52,7 @@ StSettingsTracker >> initialize [
 { #category : 'initialization' }
 StSettingsTracker >> sessionLog [
 
-	^ SessionLog
-		ifNil: [ 
-			self class initialize.
-			SessionLog ]
+	^ self class sessionLog
 ]
 
 { #category : 'initialization' }