diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fc2c01c7a..5af4e4b192 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Clean plugin uninstall residual data
 - Fix generate associated item massive action
 - Prevent invalid references and non-existent classes during generate item flow.
 - Remove unnecessary message during plugin installation
diff --git a/inc/profile.class.php b/inc/profile.class.php
index 0628382fbd..c39ddf708f 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -147,10 +147,8 @@ public static function install(Migration $migration)
 
     public static function uninstall()
     {
-        $item = new Profile();
-        $item->deleteByCriteria([
-            'name' => ['LIKE', 'PluginOrder%'],
-        ]);
+        $rights = array_column(self::getAllRights(true), 'field');
+        ProfileRight::deleteProfileRights($rights);
         self::removeRightsFromSession();
     }