diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index 69f5f7c508c09..2ca786b17e6f1 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -461,7 +461,8 @@ public function uninstall($id)
 			->select('COUNT(*)')
 			->from($db->qn('#__template_styles'))
 			->where($db->qn('home') . ' = ' . $db->q('1'))
-			->where($db->qn('template') . ' = ' . $db->q($name));
+			->where($db->qn('template') . ' = ' . $db->q($name))
+			->where($db->quoteName('client_id') . ' = ' . $clientId);
 		$db->setQuery($query);
 
 		if ($db->loadResult() != 0)