diff --git a/autorecon.py b/autorecon.py
index 2db5df7..3e8a8a9 100644
--- a/autorecon.py
+++ b/autorecon.py
@@ -531,7 +531,7 @@ async def scan_target(target):
 					if re.search(s, service.name):
 						plugin_service_match = True
 
-					if plugin.match_all_service_names_boolean or plugin_service_match:
+					if plugin_service_match:
 						plugin_tag_set = set(plugin.tags)
 
 						matching_tags = False
diff --git a/autorecon/plugins.py b/autorecon/plugins.py
index 92e1a8e..4f97811 100644
--- a/autorecon/plugins.py
+++ b/autorecon/plugins.py
@@ -108,7 +108,6 @@ class ServiceScan(Plugin):
 		self.services = []
 		self.service_names = []
 		self.ignore_service_names = []
-		self.match_all_service_names_boolean = False
 		self.run_once_boolean = False
 		self.require_ssl_boolean = False
 
@@ -189,9 +188,9 @@ class ServiceScan(Plugin):
 
 	@final
 	def match_all_service_names(self, boolean):
-		self.match_all_service_names_boolean = boolean
-		# we need at least one service name to enter loop in autorecon and make plugin finally run
-		self.match_service_name('.*')
+		if boolean:
+			# Add a "match all" service name.
+			self.match_service_name('.*')
 
 class Report(Plugin):