diff --git a/src/Entity/User.php b/src/Entity/User.php
index 303ba752..d82b14c4 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -1026,7 +1026,11 @@ class User implements UserInterface, EquatableInterface, ThemeUserInterface, Pas
 
     public function isEqualTo(UserInterface $user): bool
     {
-        if (!$user instanceof self) {
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        if ($this->id !== $user->getId()) {
             return false;
         }
 
diff --git a/tests/Entity/UserTest.php b/tests/Entity/UserTest.php
index c55e93e6..1a249f86 100644
--- a/tests/Entity/UserTest.php
+++ b/tests/Entity/UserTest.php
@@ -511,6 +511,14 @@ class UserTest extends TestCase
         $sut2->setUserIdentifier('12345678');
         self::assertTrue($sut->isEqualTo($sut2));
         self::assertTrue($sut2->isEqualTo($sut));
+
+        self::assertFalse($sut->isEnabled());
+        $sut->setEnabled(true);
+        self::assertFalse($sut->isEqualTo($sut2));
+        self::assertFalse($sut2->isEqualTo($sut));
+        $sut2->setEnabled(true);
+        self::assertTrue($sut->isEqualTo($sut2));
+        self::assertTrue($sut2->isEqualTo($sut));
     }
 
     public function testSerialize(): void