diff --git a/lib/generators.nix b/lib/generators.nix
index 400d85eee4d37f..c55ace0251fe94 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -605,8 +605,7 @@ in rec {
     ]) x));
 
   in
-  # TODO: As discussed in #356502, we should do the actual deprecation in a future release cycle.
-  lib.warnIf (!escape) "Using `lib.generators.toPlist` without `escape = true` is deprecated"
+  lib.warnIf (!escape && lib.oldestSupportedReleaseIsAtLeast 2505) "Using `lib.generators.toPlist` without `escape = true` is deprecated"
   ''<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">