diff --git a/charts/studio/templates/configmap-studio-backend.yaml b/charts/studio/templates/configmap-studio-backend.yaml
index 62f5f1fe..011f059c 100644
--- a/charts/studio/templates/configmap-studio-backend.yaml
+++ b/charts/studio/templates/configmap-studio-backend.yaml
@@ -8,6 +8,6 @@ data:
 {{- end }}
 
   LEO_SERVICE_HOST: "{{ .Release.Name }}-leo"
-  LEO_SERVICE_PORT: "{{ .Values.studioLeo.service.port }}"
+  LEO_SERVICE_PORT: "{{ ((.Values.studioLeo).service).port | default 8181 }}"
   LEO_ENCODING: "utf-8"
 
diff --git a/charts/studio/templates/service-leo.yaml b/charts/studio/templates/service-leo.yaml
index 9336e5b3..c1ba8f3d 100644
--- a/charts/studio/templates/service-leo.yaml
+++ b/charts/studio/templates/service-leo.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     {{- include "studio-leo.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.studioLeo.service.type }}
+  type: {{ ((.Values.studioLeo).service).type | default "ClusterIP" }}
   ports:
-    - port: {{ .Values.studioLeo.service.port }}
+    - port: {{ ((.Values.studioLeo).service).port | default 8181 }}
       targetPort: http
       protocol: TCP
       name: http