diff --git a/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2 b/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
index fbd3b2fa8..9b8829c16 100644
--- a/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
+++ b/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
@@ -168,10 +168,12 @@ spec:
               value: "hubble-relay:80"
             {% endif %}
 
+          {% if cilium_hubble_tls_generate -%}
           volumeMounts:
             - name: tls
               mountPath: /var/lib/hubble-ui/certs
               readOnly: true
+          {%- endif %}
           ports:
             - containerPort: 8090
               name: grpc
@@ -182,6 +184,7 @@ spec:
             defaultMode: 420
             name: hubble-ui-nginx
           name: hubble-ui-nginx-conf
+        {% if cilium_hubble_tls_generate -%}
         - projected:
             sources:
             - secret:
@@ -194,6 +197,7 @@ spec:
                   - key: tls.key
                     path: client.key
           name: tls
+        {%- endif %}
         - emptyDir: {}
           name: tmp-dir
 {% endif %}