diff --git a/.gitignore b/.gitignore
index 02626d4..fe5741b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .vscode
+.idea
 
 .artifacts/**
 .tmp/**
diff --git a/models/MailService.cfc b/models/MailService.cfc
index 0c0b904..db51ccb 100644
--- a/models/MailService.cfc
+++ b/models/MailService.cfc
@@ -376,6 +376,9 @@ component accessors="true" singleton threadsafe {
 		var tokenMarker = getTokenMarker();
 		var key         = "";
 
+		// Do not process tokens if using dynamic template (send-grid-protocol)
+		if( arguments.mail.getType() == "template" ) return;
+
 		// Check mail parts for content
 		if ( arrayLen( mailparts ) ) {
 			// Loop over mail parts