diff --git a/charts/talm/templates/_helpers.tpl b/charts/talm/templates/_helpers.tpl
index c89d0936..ca981e95 100644
--- a/charts/talm/templates/_helpers.tpl
+++ b/charts/talm/templates/_helpers.tpl
@@ -1,9 +1,14 @@
 {{- define "talm.discovered.system_disk_name" }}
+{{- $disk := "" }}
 {{- range .Disks }}
+{{- if eq $disk "" }}
+{{- $disk = .device_name }}
+{{- end }}
 {{- if .system_disk }}
-{{- .device_name }}
+{{- $disk = .device_name }}
 {{- end }}
 {{- end }}
+{{- $disk }}
 {{- end }}
 
 {{- define "talm.discovered.machinetype" }}
diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
index 7de81879..fa7e0fc2 100644
--- a/pkg/generated/presets.go
+++ b/pkg/generated/presets.go
@@ -215,11 +215,16 @@ version: %s
 description: A library Talm chart for Talos Linux
 `,
 	"talm/templates/_helpers.tpl": `{{- define "talm.discovered.system_disk_name" }}
+{{- $disk := "" }}
 {{- range .Disks }}
+{{- if eq $disk "" }}
+{{- $disk = .device_name }}
+{{- end }}
 {{- if .system_disk }}
-{{- .device_name }}
+{{- $disk = .device_name }}
 {{- end }}
 {{- end }}
+{{- $disk }}
 {{- end }}
 
 {{- define "talm.discovered.machinetype" }}