diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 5fb3834ef..ba43dec9b 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -240,7 +240,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "<CHARTNAME>.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- $default := printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- default $default .Values.fullnameOverride -}}
 {{- end -}}
 `