diff --git a/content/components/_index.md b/content/components/_index.md
index 0570e30e7e..dd46350eeb 100644
--- a/content/components/_index.md
+++ b/content/components/_index.md
@@ -132,6 +132,7 @@ ESPHome-specific components or components supporting ESPHome device provisioning
 "Debug","components/debug","bug-report.svg","dark-invert"
 "Logger","components/logger","file-document-box.svg","dark-invert"
 "Syslog","components/syslog","file-document-box.svg","dark-invert"
+"Loki","components/loki","loki.svg",""
 "Prometheus","components/prometheus","prometheus.svg",""
 "StatsD","components/statsd","connection.svg","dark-invert"
 "Safe Mode","components/safe_mode","restart-alert.svg","dark-invert"
diff --git a/content/components/loki.md b/content/components/loki.md
new file mode 100644
index 0000000000..5b56bd4e64
--- /dev/null
+++ b/content/components/loki.md
@@ -0,0 +1,39 @@
+---
+description: "Instructions for setting up a loki component in ESPHome"
+title: "Loki Component"
+params:
+  seo:
+    description: Instructions for setting up a loki component in ESPHome
+---
+
+The `loki` component can be used to send ESPHome logs to a [loki server](https://grafana.com/oss/loki/).
+It requires both a {{< docref "http_request" "HTTP Request" >}} and a {{< docref "time/index" "Time component" >}} to be configured.
+
+```yaml
+# Example configuration entry
+
+http_request:
+  useragent: esphome/loki
+  timeout: 10s
+  verify_ssl: false
+
+time:
+  - platform: sntp
+    id: sntp_time
+
+loki:
+  url: http://foo.com
+  level: DEBUG
+  enabled: true
+```
+
+## Configuration Options
+
+- **id** (*Optional*, [ID](#config-id)): Manually specify the ID used for code generation.
+- **http_request_id** (**Required**, [ID](#config-id)): The ID of the http_request client to use for sending logs. May be omitted if only
+  one http_request client is configured.
+- **time_id** (**Required**, [ID](#config-id)): The ID of the time client to use for time-stamping logs. May be omitted
+  if only one time client is configured.
+- **port** (*Optional*, int): The port of the `loki` instance to send logs to. Defaults to `3100`.
+- **level** (*Optional*, string): The highest log level to send to the loki server. Defaults to `DEBUG`.
+- **strip** (*Optional*, boolean): If set, remove color-codes from log messages. Defaults to `true`.
diff --git a/static/images/loki.svg b/static/images/loki.svg
new file mode 100644
index 0000000000..2daa843c2a
--- /dev/null
+++ b/static/images/loki.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 75 25" id="svg5" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><path d="M5 0H70a5 5 0 015 5v15a5 5 0 01-5 5H5a5 5 0 01-5-5V5a5 5 0 015-5z" style="fill:#000" id="path2"/><g aria-label="LOKI" id="component-text" style="font-weight:900;font-size:25px;font-family:Montserrat;letter-spacing:1.1px;fill:#fffffc"><path d="M6.425 21V3.5h5.9v12.925h7.9V21z" id="path11"/><path d="m31.900009 21.4q-2.15.0-3.975-.675-1.8-.675-3.125-1.9-1.325-1.25-2.075-2.925-.725-1.675-.725-3.65.0-2 .725-3.65.75-1.675 2.075-2.9 1.325-1.25 3.125-1.925 1.825-.675 3.95-.675 2.15.0 3.95.675 1.8.675 3.125 1.925 1.325 1.225 2.05 2.9.75 1.65.75 3.65.0 1.975-.75 3.65-.725 1.675-2.05 2.925-1.325 1.225-3.125 1.9-1.8.675-3.925.675zm-.025-4.775q.825.0 1.525-.3.725-.3 1.25-.85.55-.575.85-1.375.3-.825.3-1.85t-.3-1.825q-.3-.825-.85-1.375-.525-.575-1.25-.875-.7-.3-1.525-.3-.825.0-1.55.3-.7.3-1.25.875-.525.55-.825 1.375-.3.8-.3 1.825.0 1.025.3 1.85.3.8.825 1.375.55.55 1.25.85.725.3 1.55.3z" id="path13"/><path d="m50.274997 17.25-.325-6.475 6.6-7.275h6.425l-7.4 8.15-3.275 3.35zm-5.275 3.75V3.5h5.8V21zm11.5.0-5.15-6.8 3.825-4.05 8.15 10.85z" id="path15"/><path d="M65.224984 21V3.5h5.9V21z" id="path17"/></g></svg>
\ No newline at end of file