diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 3b4385e8..c7067d20 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -146,11 +146,11 @@ public function process(File $phpcsFile, $stackPtr)
     private function findSpecialAnnotation($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] === T_ECHO) {
-            $startOfStatement = $this->file->findPrevious(T_OPEN_TAG, $stackPtr);
+            $startOfStatement = $this->file->findPrevious([T_OPEN_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findPrevious(T_COMMENT, $stackPtr, $startOfStatement);
         }
         if ($this->tokens[$stackPtr]['code'] === T_OPEN_TAG_WITH_ECHO) {
-            $endOfStatement = $this->file->findNext(T_CLOSE_TAG, $stackPtr);
+            $endOfStatement = $this->file->findNext([T_CLOSE_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findNext(T_COMMENT, $stackPtr, $endOfStatement);
         }
         return false;