diff --git a/include/RE/B/BaseExtraList.h b/include/RE/B/BaseExtraList.h
index 3e4de379..5c780f32 100644
--- a/include/RE/B/BaseExtraList.h
+++ b/include/RE/B/BaseExtraList.h
@@ -65,10 +65,12 @@ namespace RE
 							_head = iter->next;
 						}
 
-						if (!_tail || *_tail == iter) {
+						if (!_tail || _tail == std::addressof(iter->next)) {
 							_tail = std::addressof(prev ? prev->next : _head);
 						}
 
+						iter->next = nullptr;
+
 						MarkType(a_type, false);
 						return std::unique_ptr<BSExtraData>{ iter };
 					}