diff --git a/charts/headscale/Chart.yaml b/charts/headscale/Chart.yaml
index e11f99f2c..0d02b9c11 100644
--- a/charts/headscale/Chart.yaml
+++ b/charts/headscale/Chart.yaml
@@ -4,7 +4,7 @@ description: An open source, self-hosted implementation of the Tailscale control
 home: https://charts.gabe565.com/charts/headscale
 icon: https://raw.githubusercontent.com/juanfont/headscale/641c6fd439a915150db3c2e83928e289b7e0c9d2/docs/logo/headscale3-dots.png
 type: application
-version: 0.8.3
+version: 0.8.4
 # renovate datasource=docker depName=ghcr.io/juanfont/headscale
 appVersion: 0.20.0
 kubeVersion: ">=1.22.0-0"
@@ -27,4 +27,4 @@ sources:
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Update common Helm release to v1.3.2
+      description: Fix error when ingress does not have a host defined
diff --git a/charts/headscale/README.md b/charts/headscale/README.md
index bda65330a..85cd5e242 100644
--- a/charts/headscale/README.md
+++ b/charts/headscale/README.md
@@ -2,7 +2,7 @@
 
 <img src="https://raw.githubusercontent.com/juanfont/headscale/641c6fd439a915150db3c2e83928e289b7e0c9d2/docs/logo/headscale3-dots.png" align="right" width="92" alt="headscale logo" style="padding-left: 20px">
 
-![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat)
+![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
 ![AppVersion: 0.20.0](https://img.shields.io/badge/AppVersion-0.20.0-informational?style=flat)
 
diff --git a/charts/headscale/templates/common.yaml b/charts/headscale/templates/common.yaml
index 43e2c5782..4965a6884 100644
--- a/charts/headscale/templates/common.yaml
+++ b/charts/headscale/templates/common.yaml
@@ -28,7 +28,7 @@ initContainers:
 
 env:
   {{- with .Values.ingress.main }}
-  {{- if .enabled }}
+  {{- if and .enabled .hosts }}
   HEADSCALE_SERVER_URL: http{{ if .tls }}s{{ end }}://{{ (first .hosts).host }}
   {{- end }}
   {{- end }}