diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index 2f1ef5a83017..83e42a6d135b 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -661,7 +661,7 @@ protected function storeExtension($deleteExisting = false)
 	 *
 	 * @param   integer  $id  The unique extension id of the component to uninstall
 	 *
-	 * @return  mixed  Return value for uninstall method in component uninstall file
+	 * @return  boolean  True on success
 	 *
 	 * @since   3.1
 	 */
diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index 66755b52432d..b403abec808b 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -461,7 +461,7 @@ public function update()
 	 *
 	 * @param   string  $eid  The tag of the language to uninstall
 	 *
-	 * @return  mixed  Return value for uninstall method in component uninstall file
+	 * @return  boolean  True on success
 	 *
 	 * @since   3.1
 	 */
diff --git a/plugins/extension/joomla/joomla.php b/plugins/extension/joomla/joomla.php
index 85805d8be8c6..20c12064b4f9 100644
--- a/plugins/extension/joomla/joomla.php
+++ b/plugins/extension/joomla/joomla.php
@@ -128,7 +128,7 @@ public function onExtensionAfterInstall($installer, $eid )
 	 *
 	 * @param   JInstaller  $installer  Installer instance
 	 * @param   integer     $eid        Extension id
-	 * @param   integer     $result     Installation result
+	 * @param   bool        $result     Installation result
 	 *
 	 * @return  void
 	 *
@@ -136,9 +136,10 @@ public function onExtensionAfterInstall($installer, $eid )
 	 */
 	public function onExtensionAfterUninstall($installer, $eid, $result)
 	{
-		if ($eid)
+		// If we have a valid extension ID and the extension was successfully uninstalled wipe out any
+		// update sites for it
+		if ($eid && $result)
 		{
-			// Wipe out any update_sites_extensions links
 			$db = JFactory::getDbo();
 			$query = $db->getQuery(true)
 				->delete('#__update_sites_extensions')