diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php
index f6f6f492ecd3a..b53b9f1c05e1f 100644
--- a/administrator/components/com_installer/models/manage.php
+++ b/administrator/components/com_installer/models/manage.php
@@ -292,10 +292,14 @@ public function remove($eid = array())
 	protected function getListQuery()
 	{
 		$query = $this->getDbo()->getQuery(true)
-			->select('*')
-			->select('2*protected+(1-protected)*enabled AS status')
-			->from('#__extensions')
-			->where('state = 0');
+			->select('e.*')
+			->select('u1.update_site_id')
+			->select('u2.update_site_id AS update_site_id_pkg')
+			->select('2*e.protected+(1-e.protected)*e.enabled AS status')
+			->from('#__extensions AS e')
+			->leftJoin('#__update_sites_extensions AS u1 ON u1.extension_id = e.extension_id')
+			->leftJoin('#__update_sites_extensions AS u2 ON u2.extension_id = e.package_id')
+ 			->where('e.state = 0');
 
 		// Process select filters.
 		$status   = $this->getState('filter.status');
@@ -344,7 +348,6 @@ protected function getListQuery()
 		}
 
 		// Note: The search for name, ordering and pagination are processed by the parent InstallerModel class (in extension.php).
-
 		return $query;
 	}
 }
diff --git a/administrator/components/com_installer/views/manage/tmpl/default.php b/administrator/components/com_installer/views/manage/tmpl/default.php
index ccc6bff0c7c25..800781a5732d8 100644
--- a/administrator/components/com_installer/views/manage/tmpl/default.php
+++ b/administrator/components/com_installer/views/manage/tmpl/default.php
@@ -103,6 +103,12 @@
 									<?php echo $item->name; ?>
 								</span>
 							</label>
+							<?php if ($item->update_site_id === null && $item->update_site_id_pkg === null && JExtensionHelper::checkIfCoreExtension($item->type, $item->element, $item->client_id, $item->folder) === false) : ?>
+								<span class="badge badge-important bold hasTooltip"
+									title="<?php echo JText::_('COM_INSTALLER_UPDATE_NOT_SUPPORTED_DESC'); ?>">
+									<?php echo JText::_('COM_INSTALLER_UPDATE_NOT_SUPPORTED'); ?>
+								</span>
+							<?php endif; ?>
 						</td>
 						<td>
 							<?php echo $item->client_translated; ?>
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index a0e31bd8676c3..d62b95268188e 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -248,6 +248,8 @@ COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
 ; This string is deprecated and will be removed with 4.0.
 COM_INSTALLER_UNINSTALL_LANGUAGE="A language should always have been installed as a package. <br />To uninstall a language, filter type by package and uninstall the package."
 COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
+COM_INSTALLER_UPDATE_NOT_SUPPORTED="Update Sites not available"
+COM_INSTALLER_UPDATE_NOT_SUPPORTED_DESC="Check Extensions &gt; Manage &gt; Update Sites and use Rebuild button."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for a update ID, update site ID or extension ID."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL="Search Extensions with Updates"
 COM_INSTALLER_UPDATESITE_DISABLE="Disable update site"