diff --git a/Oqtane.Server/Infrastructure/TokenReplace.cs b/Oqtane.Server/Infrastructure/TokenReplace.cs
index 3c7e8a8c..d2b40db4 100644
--- a/Oqtane.Server/Infrastructure/TokenReplace.cs
+++ b/Oqtane.Server/Infrastructure/TokenReplace.cs
@@ -93,6 +93,7 @@ namespace Oqtane.Infrastructure
             }
 
             var result = new StringBuilder();
+            source = source.Replace("[[", "[$_["); //avoid nested square bracket issue.
             foreach (Match match in this.TokenizerRegex.Matches(source))
             {
                 var key = match.Result("${key}");
@@ -126,7 +127,7 @@ namespace Oqtane.Infrastructure
                     result.Append(match.Result("${text}"));
                 }
             }
-
+            result.Replace("[$_", "["); //restore the changes.
             return result.ToString();
         }