diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
index 9db20c219..7a0a50203 100644
--- a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
@@ -41,7 +41,8 @@ namespace Orchard.Tokens.Implementation {
         }
 
         public string Replace(string text, IDictionary<string, object> data, ReplaceOptions options) {
-            
+            if (string.IsNullOrEmpty(text)) return string.Empty;
+
             // do we have to replace tokens with hashes ?
             bool hashMode = text.Contains("#{");