diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
index 554b8b39f4..bf8ae88b0c 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
@@ -192,6 +192,7 @@ public function process(File $phpcsFile, $stackPtr)
 
             // Ignore blank lines if required.
             if ($this->ignoreBlankLines === true
+                && trim($tokens[$stackPtr]['content']) === ''
                 && $tokens[($stackPtr - 1)]['line'] !== $tokens[$stackPtr]['line']
             ) {
                 return;
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
index be6b4eec2d..276c94ade5 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
@@ -46,6 +46,8 @@ function myFunction2()
     
 }
 
+// Ordinary comment with extra whitespace at the end    
+
 // phpcs:set Squiz.WhiteSpace.SuperfluousWhitespace ignoreBlankLines false
 
 // Уберём из системных свойств все кроме информации об услугах
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc.fixed
index aa7bb845db..65f32076f0 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc.fixed
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc.fixed
@@ -42,6 +42,8 @@ function myFunction2()
     
 }
 
+// Ordinary comment with extra whitespace at the end
+
 // phpcs:set Squiz.WhiteSpace.SuperfluousWhitespace ignoreBlankLines false
 
 // Уберём из системных свойств все кроме информации об услугах
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
index 686cfcc4a5..e4cee6c151 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
@@ -39,7 +39,8 @@ public function getErrorList($testFile='SuperfluousWhitespaceUnitTest.inc')
                 23 => 1,
                 28 => 1,
                 33 => 1,
-                53 => 1,
+                49 => 1,
+                55 => 1,
             ];
             break;
         case 'SuperfluousWhitespaceUnitTest.1.js':