diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52cd07f..8fb6201 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.1.7] - 2024-09-03
+
+### Fixed
+- Auto-switching reputation from no tracked reputation could caues issues (fixes [#10](https://github.com/DJScias/Experiencer2/issues/10)).
+
 ## [6.1.6] - 2024-08-23
 
 ### Fixed
diff --git a/modules/reputation.lua b/modules/reputation.lua
index a0a8d7b..4fccdba 100644
--- a/modules/reputation.lua
+++ b/modules/reputation.lua
@@ -1041,7 +1041,7 @@ function module:Update(elapsed)
 			end
 
 			local factionData = C_Reputation.GetWatchedFactionData();
-			if selectedFaction ~= factionData.name then
+			if factionData and selectedFaction ~= factionData.name then
 				module:MenuSetWatchedFactionID(factionData.factionID);
 				module.AutoWatchUpdate = 2;
 			else