diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index 4f0a941321..1ea6003ac6 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -1741,6 +1741,11 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 			return;
 		}
 
+		if(this.options.disabled)
+		{
+			return;
+		}
+
 		// Deferred parse function - template might not be fully loaded
 		var parse = function(template)
 		{
@@ -1798,20 +1803,17 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 		template.loadingFinished(promise);
 
 		// Wait until template (& children) are done
-		if(!this.options.disabled)
-		{
-			jQuery.when.apply(null, promise).done(
-				jQuery.proxy(function() {
-					parse.call(this, template);
-					if(!this.dynheight)
-					{
-						this.dynheight = this._getDynheight(this);
-					}
-					this.dynheight.initialized = false;
-					this.resize();
-				}, this)
-			);
-		}
+		jQuery.when.apply(null, promise).done(
+			jQuery.proxy(function() {
+				parse.call(this, template);
+				if(!this.dynheight)
+				{
+					this.dynheight = this._getDynheight(this);
+				}
+				this.dynheight.initialized = false;
+				this.resize();
+			}, this)
+		);
 	},
 
 	// Some accessors to match conventions