diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index bea869a9..56c44d25 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -11,9 +11,18 @@
     - import_tasks: Debian.yml
       when: ansible_os_family == 'Debian'
 
+    - name: Check elasticsearch-plugin performance-analyzer is install 
+      become: true
+      command: ./elasticsearch-plugin list | grep 'opendistro-performance-analyzer'
+      register: elasticsearch_performance
+      args:
+        chdir: /usr/share/elasticsearch/bin/
+
     - name: Remove performance analyzer plugin from elasticsearch
       become: true
       command: ./elasticsearch-plugin remove opendistro-performance-analyzer
+      when: elasticsearch_performance == 'opendistro-performance-analyzer'
+      ignore_errors: true
       args:
         chdir: /usr/share/elasticsearch/bin/