diff --git a/docs/widgets/services/esphome.md b/docs/widgets/services/esphome.md
index e14431fd..3cdebdad 100644
--- a/docs/widgets/services/esphome.md
+++ b/docs/widgets/services/esphome.md
@@ -16,4 +16,5 @@ To group both `offline` and `unknown` devices together, users should use the `of
 widget:
   type: esphome
   url: http://esphome.host.or.ip:port
+  cookie: authenticated=MYCOOKIE # Only for auth enabled, you can get the cookie value watching at a request from the frontend
 ```
diff --git a/src/widgets/esphome/proxy.js b/src/widgets/esphome/proxy.js
new file mode 100644
index 00000000..c9cc6a11
--- /dev/null
+++ b/src/widgets/esphome/proxy.js
@@ -0,0 +1,68 @@
+import getServiceWidget from "utils/config/service-helpers";
+import { formatApiCall, sanitizeErrorURL } from "utils/proxy/api-helpers";
+import validateWidgetData from "utils/proxy/validate-widget-data";
+import { httpProxy } from "utils/proxy/http";
+import createLogger from "utils/logger";
+import widgets from "widgets/widgets";
+
+const logger = createLogger("espHomeProxyHandler");
+
+export default async function espHomeProxyHandler(req, res, map) {
+
+  const { group, service, endpoint } = req.query;
+
+  if (group && service) {
+    const widget = await getServiceWidget(group, service);
+
+    if (widget) {
+      const url = new URL(
+        formatApiCall(widgets[widget.type].api, { endpoint, ...widget }).replace(/(?<=\?.*)\?/g, "&"),
+      );
+      
+      const params = {
+        method: widget.method ?? req.method,
+        headers: widget.headers.cookie ? { "Cookie": widget.headers.cookie } : {}
+      };
+
+      const [status, contentType, data] = await httpProxy(url, params);
+
+      let resultData = data;
+
+      if (resultData.error?.url) {
+        resultData.error.url = sanitizeErrorURL(url);
+      }
+
+      if (status === 200) {
+        if (!validateWidgetData(widget, endpoint, resultData)) {
+          return res
+            .status(status)
+            .json({ error: { message: "Invalid data", url: sanitizeErrorURL(url), data: resultData } });
+        }
+        if (map) resultData = map(resultData);
+      }
+
+      if (contentType) res.setHeader("Content-Type", contentType);
+
+      if (status === 204 || status === 304) {
+        return res.status(status).end();
+      }
+
+      if (status >= 400) {
+        logger.debug(
+          "HTTP Error %d calling %s//%s%s%s...",
+          status,
+          url.protocol,
+          url.hostname,
+          url.port ? `:${url.port}` : "",
+          url.pathname,
+        );
+        return res.status(status).json({ error: { message: "HTTP Error", url: sanitizeErrorURL(url), resultData } });
+      }
+
+      return res.status(status).send(resultData);
+    }
+  }
+
+  logger.debug("Invalid or missing proxy service type '%s' in group '%s'", service, group);
+  return res.status(400).json({ error: "Invalid proxy service type" });
+}
\ No newline at end of file
diff --git a/src/widgets/esphome/widget.js b/src/widgets/esphome/widget.js
index c5a87b68..e04f1cfc 100644
--- a/src/widgets/esphome/widget.js
+++ b/src/widgets/esphome/widget.js
@@ -1,8 +1,8 @@
-import genericProxyHandler from "utils/proxy/handlers/generic";
+import espHomeProxyHandler from "./proxy";
 
 const widget = {
   api: "{url}/ping",
-  proxyHandler: genericProxyHandler,
+  proxyHandler: espHomeProxyHandler,
 };
 
 export default widget;