diff --git a/Sources/PhishingDetection/PhishingDetectionDataStore.swift b/Sources/PhishingDetection/PhishingDetectionDataStore.swift
index 0894b3dc6..f247f90b8 100644
--- a/Sources/PhishingDetection/PhishingDetectionDataStore.swift
+++ b/Sources/PhishingDetection/PhishingDetectionDataStore.swift
@@ -202,18 +202,18 @@ public class PhishingDetectionDataStore: PhishingDetectionDataSaving {
 
 extension PhishingDetectionDataStore {
     public func saveFilterSet(set: Set<Filter>) {
-        writeFilterSet()
         self.filterSet = set
+        writeFilterSet()
     }
 
     public func saveHashPrefixes(set: Set<String>) {
-        writeHashPrefixes()
         self.hashPrefixes = set
+        writeHashPrefixes()
     }
 
     public func saveRevision(_ revision: Int) {
-        writeRevision()
         self.currentRevision = revision
+        writeRevision()
     }
 }
 
diff --git a/Tests/PhishingDetectionTests/PhishingDetectionDataStoreTests.swift b/Tests/PhishingDetectionTests/PhishingDetectionDataStoreTests.swift
index cb641602b..82dda6f19 100644
--- a/Tests/PhishingDetectionTests/PhishingDetectionDataStoreTests.swift
+++ b/Tests/PhishingDetectionTests/PhishingDetectionDataStoreTests.swift
@@ -147,4 +147,51 @@ class PhishingDetectionDataStoreTests: XCTestCase {
             XCTFail("Failed to decode stored PhishingDetection data")
         }
     }
+
+    func testLazyLoadingDoesNotReturnStaleData() async {
+        clearDatasets()
+
+        // Set up initial data
+        let initialFilterSet = Set([Filter(hashValue: "initial", regex: "initial")])
+        let initialHashPrefixes = Set(["initialPrefix"])
+        mockDataProvider.shouldReturnFilterSet(set: initialFilterSet)
+        mockDataProvider.shouldReturnHashPrefixes(set: initialHashPrefixes)
+
+        // Access the lazy-loaded properties to trigger loading
+        let loadedFilterSet = dataStore.filterSet
+        let loadedHashPrefixes = dataStore.hashPrefixes
+
+        // Validate loaded data matches initial data
+        XCTAssertEqual(loadedFilterSet, initialFilterSet)
+        XCTAssertEqual(loadedHashPrefixes, initialHashPrefixes)
+
+        // Update in-memory data
+        let updatedFilterSet = Set([Filter(hashValue: "updated", regex: "updated")])
+        let updatedHashPrefixes = Set(["updatedPrefix"])
+        dataStore.saveFilterSet(set: updatedFilterSet)
+        dataStore.saveHashPrefixes(set: updatedHashPrefixes)
+
+        // Access lazy-loaded properties again
+        let reloadedFilterSet = dataStore.filterSet
+        let reloadedHashPrefixes = dataStore.hashPrefixes
+
+        // Validate reloaded data matches updated data
+        XCTAssertEqual(reloadedFilterSet, updatedFilterSet)
+        XCTAssertEqual(reloadedHashPrefixes, updatedHashPrefixes)
+
+        // Validate on-disk data is also updated
+        let storedFilterSetData = fileStorageManager.read(from: "filterSet.json")
+        let storedHashPrefixesData = fileStorageManager.read(from: "hashPrefixes.json")
+
+        let decoder = JSONDecoder()
+        if let storedFilterSet = try? decoder.decode(Set<Filter>.self, from: storedFilterSetData!),
+           let storedHashPrefixes = try? decoder.decode(Set<String>.self, from: storedHashPrefixesData!) {
+            
+            XCTAssertEqual(storedFilterSet, updatedFilterSet)
+            XCTAssertEqual(storedHashPrefixes, updatedHashPrefixes)
+        } else {
+            XCTFail("Failed to decode stored PhishingDetection data after update")
+        }
+    }
+
 }