diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index b6f64ad742..2ec46b71c1 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -149,6 +149,8 @@ class Addon extends BaseObject
 			$func();
 		}
 
+		DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']);
+
 		unset(self::$addons[array_search($addon, self::$addons)]);
 
 		Addon::saveEnabledList();
diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 33e7c7a00c..1fadf6768b 100644
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -48,7 +48,8 @@ class Details extends BaseAdminModule
 			$addon = $a->argv[2];
 			$addon = Strings::sanitizeFilePathItem($addon);
 			if (!is_file("addon/$addon/$addon.php")) {
-				notice(L10n::t('Item not found.'));
+				notice(L10n::t('Addon not found.'));
+				Addon::uninstall($addon);
 				$a->internalRedirect('admin/addons');
 			}