diff --git a/charts/testkube-cloud-api/templates/deployment.yaml b/charts/testkube-cloud-api/templates/deployment.yaml
index f3ca1dbfd..cc41bc359 100644
--- a/charts/testkube-cloud-api/templates/deployment.yaml
+++ b/charts/testkube-cloud-api/templates/deployment.yaml
@@ -385,10 +385,12 @@ spec:
               value: "{{ .Values.api.minio.signing.hostname }}"
             - name: "AGENT_STORAGE_SSL"
               value: "{{ .Values.api.minio.signing.secure }}"
+            {{- if .Values.global.storage.public.endpoint }}
             - name: "PUBLIC_STORAGE_HOSTNAME"
               value: "{{ .Values.global.storage.public.endpoint }}"
             - name: "PUBLIC_STORAGE_SSL"
-              value: "{{ .Values.global.storage.public.secure }}"
+              value: "{{ .Values.global.storage.public.secure | default "false" }}"
+            {{- end }}
             {{- if .Values.api.minio.certSecret.enabled }}
             - name: "MINIO_CERT_FILE"
               value: "{{ .Values.api.minio.certSecret.baseMountPath }}/{{ .Values.api.minio.certSecret.certFile }}"