diff --git a/common/content/world_content_service.cpp b/common/content/world_content_service.cpp
index 914e2813b..2b1a0f807 100644
--- a/common/content/world_content_service.cpp
+++ b/common/content/world_content_service.cpp
@@ -320,7 +320,9 @@ bool WorldContentService::DoesZonePassContentFiltering(const ZoneRepository::Zon
 	return DoesPassContentFiltering(f);
 }
 
-void WorldContentService::LoadTargetedRulesets(Database* db)
+
+
+void WorldContentService::LoadTargetedRulesets()
 {
 	if (!m_zone_id) {
 		LogError("Zone ID is not set. Cannot load targeted rulesets.");
@@ -331,8 +333,8 @@ void WorldContentService::LoadTargetedRulesets(Database* db)
 
 	constexpr int8 EXPANSION_ZERO_VALUE = -2;
 
-	auto rules = RuleValuesRepository::GetWhere(*db, "TRUE ORDER BY ruleset_id, rule_name");
-	auto sets  = RuleSetsRepository::GetWhere(*db, "TRUE ORDER BY ruleset_id");
+	auto rules = RuleValuesRepository::GetWhere(*m_database, "TRUE ORDER BY ruleset_id, rule_name");
+	auto sets  = RuleSetsRepository::GetWhere(*m_database, "TRUE ORDER BY ruleset_id");
 	for (auto& e : sets) {
 		bool has_filters =
 			!e.zone_ids.empty() ||
diff --git a/common/content/world_content_service.h b/common/content/world_content_service.h
index 013fbc32b..2ba58a4a9 100644
--- a/common/content/world_content_service.h
+++ b/common/content/world_content_service.h
@@ -82,7 +82,7 @@ namespace Expansion {
 		"Empires of Kunark",
 		"Ring of Scale",
 		"The Burning Lands",
-		"Torment of Velious",
+		"Torment of Velious"
 	};
 }
 
@@ -194,7 +194,7 @@ public:
 	bool IsInPublicStaticInstance(uint32 instance_id);
 
 	// targeted rulesets
-	void LoadTargetedRulesets(Database* db);
+	void LoadTargetedRulesets();
 	inline void SetZoneId(int zone_id) { m_zone_id = zone_id; }
 	inline void SetInstanceVersion(int instance_version) { m_instance_version = instance_version; }
 
diff --git a/common/rulesys.cpp b/common/rulesys.cpp
index 3fa0ec925..84043ca99 100644
--- a/common/rulesys.cpp
+++ b/common/rulesys.cpp
@@ -328,7 +328,7 @@ bool RuleManager::LoadRules(Database *db, const std::string &rule_set_name, bool
 	);
 
 	if (m_post_load_callback) {
-		m_post_load_callback(db);
+		m_post_load_callback();
 	}
 
 	return true;
diff --git a/common/rulesys.h b/common/rulesys.h
index 1ee5f4939..b2dc00b34 100644
--- a/common/rulesys.h
+++ b/common/rulesys.h
@@ -157,7 +157,7 @@ public:
 	bool UpdateInjectedRules(Database* db, const std::string& rule_set_name, bool quiet_update = false);
 	bool UpdateOrphanedRules(Database* db, bool quiet_update = false);
 	bool RestoreRuleNotes(Database* db);
-	void SetPostLoadCallback(std::function<void(Database*)> cb) {
+	void SetPostLoadCallback(std::function<void()> cb) {
 		m_post_load_callback = std::move(cb);
 	}
 
@@ -174,7 +174,7 @@ private:
 	uint32      m_RuleBoolValues[BoolRuleCount];
 	std::string m_RuleStringValues[StringRuleCount];
 
-	std::function<void(Database*)> m_post_load_callback;
+	std::function<void()> m_post_load_callback;
 
 	typedef enum {
 		IntRule,
diff --git a/zone/main.cpp b/zone/main.cpp
index 0f60a746d..269a8f778 100644
--- a/zone/main.cpp
+++ b/zone/main.cpp
@@ -414,8 +414,8 @@ int main(int argc, char **argv)
 
 	ZoneEventScheduler::Instance()->SetDatabase(&database)->LoadScheduledEvents();
 	RuleManager::Instance()->SetPostLoadCallback(
-		[&](Database* db) {
-			WorldContentService::Instance()->LoadTargetedRulesets(db);
+		[&]() {
+			WorldContentService::Instance()->LoadTargetedRulesets();
 		}
 	);