diff --git a/voltha/templates/freeradius-config.yaml b/voltha/templates/freeradius-config.yaml
index 2e54c5e..92229d8 100644
--- a/voltha/templates/freeradius-config.yaml
+++ b/voltha/templates/freeradius-config.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if .Values.freeradius.enabled }}
 apiVersion: v1
 data:
   clients.conf: |
@@ -26,3 +27,4 @@
   name: freeradius-config
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+{{- end}}