diff --git a/SKSE/Plugins/ArtifactTracker.dll b/SKSE/Plugins/ArtifactTracker.dll
index d6252c6..65f3e4b 100644
Binary files a/SKSE/Plugins/ArtifactTracker.dll and b/SKSE/Plugins/ArtifactTracker.dll differ
diff --git a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
index 66d0a98..b9caf19 100644
--- a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
+++ b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
@@ -184,8 +184,9 @@ namespace ArtifactTracker
 	void OnCellEnter(RE::FormID a_formID)
 	{
 		RE::TESObjectCELL* cell = RE::TESForm::LookupByID<RE::TESObjectCELL>(a_formID);
+		RE::BGSLocation* location = cell ? cell->GetLocation() : nullptr;
 
-		if (!cell || !cell->IsInteriorCell()) {
+		if (!cell || !cell->IsInteriorCell() || !location || !location->HasKeyword(g_homeKeyword)) {
 			if (IsHome()) {
 				RE::ScriptEventSourceHolder::GetSingleton()->RemoveEventSink<RE::TESCellFullyLoadedEvent>(EventListener::GetSingleton());
 				ToggleHomeMode(nullptr);