diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index ab6e7e41026c03782324fe99a4887cb2ddf233ac..32814af974e186232323d3caa4938be25a262bf4 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -361,7 +361,8 @@ class MailController extends ActionController {
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 */
 	public function resetAction($template, $extensionKey) {
-		$this->templateRepository->deleteTemplate($extensionKey, $template);
+		$pid = (int) GeneralUtility::_GP('id');
+		$this->templateRepository->deleteTemplate($extensionKey, $template, $pid);
 
 		$message = LocalizationUtility::translate('backend.template_reset', 'sg_mail');
 		$this->addFlashMessage($message, '', FlashMessage::OK);
diff --git a/Classes/Domain/Repository/TemplateRepository.php b/Classes/Domain/Repository/TemplateRepository.php
index 4c2b6d414541af12feff0d67b94c0e9d8b7a0249..b72e3bc21e2362adcb2243f59209c8a1d3624b55 100644
--- a/Classes/Domain/Repository/TemplateRepository.php
+++ b/Classes/Domain/Repository/TemplateRepository.php
@@ -63,16 +63,18 @@ class TemplateRepository extends AbstractRepository {
 	/**
 	 * Delete a Template
 	 *
-	 * @param $extensionKey
-	 * @param $templateName
+	 * @param string $extensionKey
+	 * @param string $templateName
+	 * @param int $pid
 	 */
-	public function deleteTemplate($extensionKey, $templateName) {
+	public function deleteTemplate($extensionKey, $templateName, $pid) {
 		/** @var $databaseConnection DatabaseConnection */
 		$databaseConnection = $GLOBALS['TYPO3_DB'];
 
 		$tableName = 'tx_sgmail_domain_model_template';
 		$where = 'extension_key = ' . $databaseConnection->fullQuoteStr($extensionKey, $tableName);
-		$where.= ' AND template_name = ' . $databaseConnection->fullQuoteStr($templateName, $tableName);
+		$where .= ' AND template_name = ' . $databaseConnection->fullQuoteStr($templateName, $tableName);
+		$where .= ' AND pid = ' . (int) $pid;
 
 		$databaseConnection->exec_DELETEquery($tableName, $where);
 	}