diff --git a/infra/charts/feast-feature-server/templates/deployment.yaml b/infra/charts/feast-feature-server/templates/deployment.yaml
index 6cd17d4a4d1..ef0cc9671de 100644
--- a/infra/charts/feast-feature-server/templates/deployment.yaml
+++ b/infra/charts/feast-feature-server/templates/deployment.yaml
@@ -11,10 +11,12 @@ spec:
       {{- include "feast-feature-server.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-    {{- with .Values.podAnnotations }}
+    {{- if or .Values.podAnnotations .Values.metrics.enabled }}
       annotations:
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
-        {{- if .Values.metrics.enabled }}
+        {{- end }}
+        {{- if $.Values.metrics.enabled }}
         instrumentation.opentelemetry.io/inject-python: "true"
         {{- end }}
     {{- end }}