diff --git a/src/editor/components/EntitySelector.ts b/src/editor/components/EntitySelector.ts
index 31db8b978d..4d749ccc62 100644
--- a/src/editor/components/EntitySelector.ts
+++ b/src/editor/components/EntitySelector.ts
@@ -1,14 +1,10 @@
-import { HassEntity } from 'home-assistant-js-websocket';
-
-import { byPropertiesOf } from '../../helpers/sort';
 import { openEntityFilter } from '../editors/entity-filter';
 import { getEntities, getUiSettings } from '../haserver';
 import { disableSelect2OpenOnRemove } from '../utils';
 import {
-    createCustomIdListByProperty,
     createSelect2Options,
     isSelect2Initialized,
-    Select2Data,
+    Select2AjaxEndpoints,
     Tags,
 } from './select2';
 
@@ -18,17 +14,20 @@ export default class EntitySelector {
     #$filterType: JQuery<HTMLElement>;
     #$filterButton: JQuery<HTMLElement>;
     #entityId: string | string[];
-    #select2Data: Select2Data[];
+    #serverId?: string;
 
     constructor({
         filterTypeSelector,
         entityId,
+        serverId,
     }: {
         filterTypeSelector: string;
         entityId: string | string[];
+        serverId?: string;
     }) {
         this.#$filterType = $(filterTypeSelector);
         this.#entityId = entityId;
+        this.#serverId = serverId;
 
         this.#buildElements();
         this.init();
@@ -55,13 +54,40 @@ export default class EntitySelector {
         return id;
     }
 
+    #generateEntityList() {
+        const entities = getEntities();
+        const ids = !Array.isArray(this.#entityId)
+            ? [this.#entityId]
+            : this.#entityId;
+
+        const options = ids.reduce((acc: JQuery<HTMLElement>[], id: string) => {
+            const text =
+                getUiSettings().entitySelector === 'id'
+                    ? id
+                    : entities.find((e) => e.entity_id === id)?.attributes
+                          .friendly_name ?? id;
+            acc.push(
+                $('<option />', {
+                    value: id,
+                    text,
+                    selected: true,
+                })
+            );
+            return acc;
+        }, []);
+
+        return options;
+    }
+
     #buildElements() {
         const $formRow = this.#$filterType.parent();
         const $div = $('<div />', {
             class: 'ha-entity-selector',
         });
+        const filterType = this.#$filterType.val() as string;
         this.#$select = $(`<select />`, {
             id: 'ha-entity-selector',
+            multiple: filterType === 'list',
         });
         this.#$filter = $('<input />', {
             type: 'text',
@@ -75,10 +101,15 @@ export default class EntitySelector {
             $div.append([this.#$select, this.#$filter, this.#$filterButton])
         );
         this.#$filterType.appendTo($div);
+
+        // Populate select with selected ids
+        if (this.#entityId !== '') {
+            this.#$select.append(this.#generateEntityList());
+        }
     }
 
     init() {
-        this.#$filterType.on('change', this.#showHide.bind(this));
+        this.#$filterType.on('change', this.#showHideFilterOptions.bind(this));
 
         this.#$filterButton.on('click', () => {
             openEntityFilter({
@@ -91,12 +122,11 @@ export default class EntitySelector {
             });
         });
 
-        this.#generateEntityList();
         this.#initSelect2(Array.isArray(this.#entityId));
         this.#$filter.val(this.#entityId);
     }
 
-    #showHide() {
+    #showHideFilterOptions() {
         const filter = this.#$filterType.val() as string;
         switch (filter) {
             case 'exact':
@@ -114,41 +144,17 @@ export default class EntitySelector {
         }
     }
 
-    #generateEntityList() {
-        const entities = Object.values(getEntities());
-        const entityIds = !this.#select2Data
-            ? Array.isArray(this.#entityId)
-                ? this.#entityId
-                : [this.#entityId]
-            : this.#$select.select2('data').map((e) => e.id);
-
-        const data = entities
-            .map((e): Select2Data => {
-                return {
-                    id: e.entity_id,
-                    text: e.attributes.friendly_name ?? e.entity_id,
-                    title: e.entity_id,
-                    selected: entityIds.includes(e.entity_id),
-                };
-            })
-            .sort(byPropertiesOf<Select2Data>(['text']))
-            .concat(
-                createCustomIdListByProperty<HassEntity>(entityIds, entities, {
-                    property: 'entity_id',
-                    includeUnknownIds: true,
-                })
-            );
-        this.#select2Data = data;
-    }
-
     #initSelect2(multiple = false) {
         this.#$select
             .select2(
                 createSelect2Options({
-                    data: this.#select2Data.filter((e) => e.id?.length > 0),
                     tags: Tags.Custom,
                     multiple,
                     displayIds: getUiSettings().entitySelector === 'id',
+                    ajax: {
+                        endpoint: Select2AjaxEndpoints.Entities,
+                        serverId: this.#serverId,
+                    },
                 })
             )
             .maximizeSelect2Height();
@@ -163,9 +169,9 @@ export default class EntitySelector {
         }
     }
 
-    serverChanged() {
+    serverChanged(serverId: string) {
+        this.#serverId = serverId;
         this.#$select.empty();
-        this.#generateEntityList();
-        this.#showHide();
+        this.#showHideFilterOptions();
     }
 }
diff --git a/src/editor/components/select2.ts b/src/editor/components/select2.ts
index c21415c3b1..ed416ad879 100644
--- a/src/editor/components/select2.ts
+++ b/src/editor/components/select2.ts
@@ -4,9 +4,13 @@ import { containsMustache, isNodeRedEnvVar } from '../../helpers/utils';
 import { isjQuery } from '../utils';
 
 export enum Tags {
-    Any,
-    Custom,
-    None,
+    Any = 'any',
+    Custom = 'custom',
+    None = 'none',
+}
+
+export enum Select2AjaxEndpoints {
+    Entities = 'entitiesSelect2',
 }
 
 export interface Select2Data {
@@ -16,6 +20,11 @@ export interface Select2Data {
     title?: string;
 }
 
+interface Select2AjaxOptions {
+    endpoint: Select2AjaxEndpoints;
+    serverId?: string;
+}
+
 export const select2DefaultOptions: Options = {
     theme: 'nodered',
     templateResult: (item: any) => {
@@ -53,12 +62,14 @@ export const createSelect2Options = ({
     customTags = [],
     displayIds = false,
     data,
+    ajax,
 }: {
     multiple?: boolean;
     tags?: Tags;
     customTags?: string[];
     displayIds?: boolean;
     data?: Select2Data[];
+    ajax?: Select2AjaxOptions;
 }) => {
     const opts = {
         ...select2DefaultOptions,
@@ -67,6 +78,13 @@ export const createSelect2Options = ({
         dropdownAutoWidth: true,
     };
 
+    if (ajax?.serverId) {
+        opts.ajax = {
+            url: `homeassistant/${ajax.endpoint}/${ajax.serverId}`,
+            dataType: 'json',
+            delay: 250,
+        };
+    }
     opts.tags = tags === Tags.Any || tags === Tags.Custom;
 
     if (tags === Tags.Custom) {
@@ -91,12 +109,15 @@ export const createSelect2Options = ({
                     text: params.term,
                 };
             }
+
+            return null;
         };
     }
 
     if (displayIds) {
         opts.templateSelection = (selection) => {
-            return selection.id.toString();
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            return selection.id!.toString();
         };
     }
 
diff --git a/src/editor/data.ts b/src/editor/data.ts
index cc40bee940..a633bdee8a 100644
--- a/src/editor/data.ts
+++ b/src/editor/data.ts
@@ -140,7 +140,7 @@ function sortFriendlyName(a: Record<string, any>, b: Record<string, any>) {
     return aName.localeCompare(bName);
 }
 
-export function getAreaNameById($serverId: string, areaId: string) {
+export function getAreaNameById($serverId: string, areaId?: string) {
     const areas = getAreas($serverId);
     if (areaId && areas?.length) {
         const area = areas.find((a) => a.area_id === areaId);
diff --git a/src/editor/haserver.ts b/src/editor/haserver.ts
index 762fe1771f..ea36c2f05f 100644
--- a/src/editor/haserver.ts
+++ b/src/editor/haserver.ts
@@ -27,7 +27,7 @@ function setDefault() {
 export function init(
     n: EditorNodeInstance<HassNodeProperties>,
     server: string,
-    onChange?: () => void
+    onChange?: (serverId: string) => void
 ) {
     $server = $(server);
     node = n;
@@ -40,10 +40,13 @@ export function init(
     setTimeout(() => {
         $server.on('change', () => {
             serverId = $server.val() as string;
-            onChange?.();
+            onChange?.(serverId);
         });
     }, 500);
 }
+export function getSelectedServerId() {
+    return serverId;
+}
 
 export function autocomplete(type: string, callback: (items: any) => void) {
     // If a server is selected populate drop downs
@@ -112,7 +115,7 @@ export const getAreaById = (areaId: string): HassArea | undefined => {
     }
 };
 
-export const getAreaNameById = (areaId: string): string => {
+export const getAreaNameById = (areaId?: string): string => {
     return haData.getAreaNameById(serverId, areaId);
 };
 
diff --git a/src/helpers/registry.ts b/src/helpers/registry.ts
new file mode 100644
index 0000000000..dd31aceff9
--- /dev/null
+++ b/src/helpers/registry.ts
@@ -0,0 +1,90 @@
+import { RED } from '../globals';
+import Websocket from '../homeAssistant/Websocket';
+import {
+    HassAreas,
+    HassDevices,
+    HassEntityRegistryEntry,
+} from '../types/home-assistant';
+
+export function getAreaNameByEntityId(
+    entityId: string,
+    areas: HassAreas,
+    devices: HassDevices,
+    entities: HassEntityRegistryEntry[]
+) {
+    const areaId = getAreaIdByEntityId(entityId, areas, devices, entities);
+    return getAreaNameByAreaId(areaId, areas);
+}
+
+function getAreaNameByAreaId(areaId: string | null, areas: HassAreas) {
+    if (areaId && areas?.length) {
+        const area = areas.find((a) => a.area_id === areaId);
+        if (area) {
+            return area.name;
+        }
+    }
+
+    return RED._('ha-device.ui.no_area');
+}
+
+function getAreaIdByEntityId(
+    entityId: string,
+    areas: HassAreas,
+    devices: HassDevices,
+    entities: HassEntityRegistryEntry[]
+) {
+    const entity = getEntityById(entityId, entities);
+
+    if (entity?.area_id) {
+        return entity.area_id;
+    }
+
+    if (areas?.length) {
+        const area = areas.find((area) => {
+            const device = getDeviceByEntityId(entityId, devices, entities);
+            return device?.area_id === area.area_id;
+        });
+
+        if (area) {
+            return area.area_id;
+        }
+    }
+
+    return null;
+}
+
+function getDeviceByEntityId(
+    entityId: string,
+    devices: HassDevices,
+    entities: HassEntityRegistryEntry[]
+) {
+    const entity = getEntityById(entityId, entities);
+
+    if (entity?.device_id && devices?.length) {
+        const device = devices.find((device) => entity.device_id === device.id);
+        if (device) {
+            return device;
+        }
+    }
+
+    return null;
+}
+
+function getEntityById(
+    entityId: string,
+    entities: HassEntityRegistryEntry[]
+): HassEntityRegistryEntry | null {
+    if (entityId && entities) {
+        return entities.find((e) => e.entity_id === entityId) ?? null;
+    }
+
+    return null;
+}
+
+export function getRegistryData(HassWS: Websocket) {
+    return {
+        areas: HassWS.getAreas(),
+        devices: HassWS.getDevices(),
+        entities: HassWS.getEntities(),
+    };
+}
diff --git a/src/homeAssistant/Websocket.ts b/src/homeAssistant/Websocket.ts
index 8aba9022f9..b5519fd1d6 100644
--- a/src/homeAssistant/Websocket.ts
+++ b/src/homeAssistant/Websocket.ts
@@ -532,6 +532,10 @@ export default class Websocket {
         this.#emitEvent('ha_client:close');
     }
 
+    getAreas(): HassAreas {
+        return this.areas;
+    }
+
     getDevices(): HassDevices {
         return this.devices;
     }
@@ -580,6 +584,10 @@ export default class Websocket {
         return results.extra_fields;
     }
 
+    getEntities() {
+        return this.entities;
+    }
+
     getStates(): HassEntities;
     getStates(entityId?: string): HassEntity | null;
     getStates(entityId?: unknown): unknown {
diff --git a/src/nodes/events-state/editor.ts b/src/nodes/events-state/editor.ts
index 3efb7ecd53..1c928c0d06 100644
--- a/src/nodes/events-state/editor.ts
+++ b/src/nodes/events-state/editor.ts
@@ -104,27 +104,17 @@ const EventsStateEditor: EditorNodeDef<EventsStateEditorNodeProperties> = {
     },
     oneditprepare: function () {
         ha.setup(this);
-        const $entityidfilter = $('#node-input-entityidfilter');
-
-        haServer.init(this, '#node-input-server', () => {
-            entitySelector.serverChanged();
+        haServer.init(this, '#node-input-server', (serverId) => {
+            entitySelector.serverChanged(serverId);
         });
         exposeNode.init(this);
         const entitySelector = new EntitySelector({
             filterTypeSelector: '#node-input-entityidfiltertype',
             entityId: this.entityidfilter,
+            serverId: haServer.getSelectedServerId(),
         });
         $('#dialog-form').data('entitySelector', entitySelector);
 
-        let availableEntities: string[] = [];
-        haServer.autocomplete('entities', (entities: string[]) => {
-            availableEntities = entities;
-            $entityidfilter.autocomplete({
-                source: availableEntities,
-                minLength: 0,
-            });
-        });
-
         ifState.init('#node-input-haltifstate', '#node-input-halt_if_compare');
 
         $('#node-input-for').typedInput({
diff --git a/src/nodes/trigger-state/editor.ts b/src/nodes/trigger-state/editor.ts
index db4d968da9..60a57ff297 100644
--- a/src/nodes/trigger-state/editor.ts
+++ b/src/nodes/trigger-state/editor.ts
@@ -116,12 +116,13 @@ const TriggerStateEditor: EditorNodeDef<TriggerStateEditorNodeProperties> = {
         const $constraintList = $('#constraint-list');
         const $outputList = $('#output-list');
 
-        haServer.init(this, '#node-input-server', () => {
-            entitySelector.serverChanged();
+        haServer.init(this, '#node-input-server', (serverId) => {
+            entitySelector.serverChanged(serverId);
         });
         const entitySelector = new EntitySelector({
             filterTypeSelector: '#node-input-entityidfiltertype',
             entityId: this.entityid,
+            serverId: haServer.getSelectedServerId(),
         });
         $('#dialog-form').data('entitySelector', entitySelector);
 
diff --git a/src/nodes/wait-until/editor.ts b/src/nodes/wait-until/editor.ts
index 56f535a71a..23b44243ac 100644
--- a/src/nodes/wait-until/editor.ts
+++ b/src/nodes/wait-until/editor.ts
@@ -70,12 +70,13 @@ const WaitUntilEditor: EditorNodeDef<WaitUntilEditorNodeProperties> = {
     },
     oneditprepare: function () {
         ha.setup(this);
-        haServer.init(this, '#node-input-server', () => {
-            entitySelector.serverChanged();
+        haServer.init(this, '#node-input-server', (serverId) => {
+            entitySelector.serverChanged(serverId);
         });
         const entitySelector = new EntitySelector({
             filterTypeSelector: '#node-input-entityIdFilterType',
             entityId: this.entityId,
+            serverId: haServer.getSelectedServerId(),
         });
         $('#dialog-form').data('entitySelector', entitySelector);
 
diff --git a/src/routes.ts b/src/routes.ts
index 2163036049..d0794ab823 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -90,6 +90,42 @@ async function getDeviceTriggerCapabilities(
     res.json(capabilities ?? []);
 }
 
+function getEntitiesSelect2(req: CustomRequest, res: Response): void {
+    const websocket = req?.homeAssistant?.websocket;
+
+    if (!websocket) {
+        res.json({ results: [] });
+        return;
+    }
+
+    const term = req.query.term?.toString().trim();
+    const states = Object.values(websocket.getStates());
+
+    const filteredEntities = !term
+        ? states
+        : states?.filter((entity) => {
+              const words = term.split(' ');
+              const friendlyName =
+                  entity.attributes.friendly_name?.toLowerCase();
+
+              return words.every(
+                  (word) =>
+                      friendlyName?.indexOf(word) !== -1 ||
+                      entity.entity_id?.indexOf(word) !== -1
+              );
+          });
+
+    const results = filteredEntities.map((e) => {
+        return {
+            id: e.entity_id,
+            text: e.attributes.friendly_name ?? e.entity_id,
+            title: e.entity_id,
+        };
+    });
+
+    res.json({ results });
+}
+
 function getEntities(req: CustomRequest, res: Response): void {
     const states = req?.homeAssistant?.getEntities();
     res.json(states ?? []);
@@ -112,23 +148,21 @@ function getProperties(req: CustomRequest, res: Response): void {
 
     const entity = req?.homeAssistant?.websocket.getStates(entityId);
 
-    if (!entity) {
+    if (Array.isArray(entity)) {
+        flat = Object.keys(flatten(entity)).filter(
+            (e) =>
+                req?.query?.term && e.indexOf(req.query.term.toString()) !== -1
+        );
+    } else {
         const entities = req.homeAssistant?.websocket.getStates();
         if (!entities) {
             res.json([]);
             return;
         }
-
         flat = Object.values(entities).map((entity) =>
             Object.keys(flatten(entity))
         );
-    } else {
-        flat = Object.keys(flatten(entity)).filter(
-            (e) =>
-                req?.query?.term && e.indexOf(req.query.term.toString()) !== -1
-        );
     }
-
     const uniqProperties = Array.from(
         new Set(([] as string[]).concat(...flat))
     );
@@ -214,6 +248,7 @@ export function createRoutes(): void {
         deviceTriggers: getDeviceTriggers,
         deviceTriggerCapabilities: getDeviceTriggerCapabilities,
         entities: getEntities,
+        entitiesSelect2: getEntitiesSelect2,
         properties: getProperties,
         services: getServices,
         states: getStates,