diff --git a/docker/k8s/pmm-client/Dockerfile b/docker/k8s/pmm-client/Dockerfile
index e5e4418b7e4..82d6f482efc 100644
--- a/docker/k8s/pmm-client/Dockerfile
+++ b/docker/k8s/pmm-client/Dockerfile
@@ -7,6 +7,7 @@ COPY --from=k8s /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificate
 
 RUN apt-get update && \
     apt-get upgrade -qq && \
+    apt-get install -y procps && \
     apt-get install wget -qq --no-install-recommends && \
     wget https://www.percona.com/redir/downloads/pmm-client/1.15.0/binary/debian/stretch/x86_64/pmm-client_1.15.0-1.stretch_amd64.deb && \
     dpkg -i pmm-client_1.15.0-1.stretch_amd64.deb && \
diff --git a/helm/vitess/templates/_pmm.tpl b/helm/vitess/templates/_pmm.tpl
index 810171cb99a..69c63b16489 100644
--- a/helm/vitess/templates/_pmm.tpl
+++ b/helm/vitess/templates/_pmm.tpl
@@ -169,8 +169,11 @@ spec:
       pmm-admin config --server pmm.{{ $namespace }} --force
 
       # creates a systemd service
-      # TODO: remove "|| true" after https://jira.percona.com/projects/PMM/issues/PMM-1985 is resolved
-      pmm-admin add mysql:metrics --user root --socket /vtdataroot/tabletdata/mysql.sock --force || true
+      until [ -e /vtdataroot/tabletdata/mysql.sock ]; do
+        echo "Waiting for mysql.sock"
+        sleep 1
+      done
+      pmm-admin add mysql:metrics --user root --socket /vtdataroot/tabletdata/mysql.sock --force
 
       # keep the container alive but still responsive to stop requests
       trap : TERM INT; sleep infinity & wait
@@ -183,4 +186,4 @@ spec:
     - name: vtdataroot
       mountPath: /vtdataroot
 
-{{- end -}}
\ No newline at end of file
+{{- end -}}