diff --git a/gravity-forms/gw-format-date-merge-tags.php b/gravity-forms/gw-format-date-merge-tags.php
index 271846736..60b2505ef 100644
--- a/gravity-forms/gw-format-date-merge-tags.php
+++ b/gravity-forms/gw-format-date-merge-tags.php
@@ -34,6 +34,10 @@ public function init() {
 	}
 
 	public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format ) {
+		if ( ! $this->is_applicable_form( $form ) ) {
+			return $text;
+		}
+
 		$current_locale = determine_locale();
 		$locale         = $this->_args['locale'];
 		if ( $locale ) {