diff --git a/plugins/other/ejabberd_ b/plugins/other/ejabberd_
index 5487b5e1..ec2b3f7d 100755
--- a/plugins/other/ejabberd_
+++ b/plugins/other/ejabberd_
@@ -78,9 +78,11 @@ if [ -z "$vhosts" ]; then
 fi
 
 # get ejabberd PID
-#EJPID=$(pidof -s /usr/lib/erlang/erts-5.6.3/bin/beam.smp)
-#EJPID=$(ps -ef | awk '/\/bin\/beam.smp/ && !/awk/ {print $2}')
-EJPID=$(cat /var/run/ejabberd/ejabberd.pid)
+if [[ ${EJVER%\.[0-9]} == 2.1 ]]; then
+	EJPID=$(cat /var/run/ejabberd/ejabberd.pid)
+else
+	EJPID=$(ps -ef | awk '/\/bin\/beam.smp/ && !/awk/ {print $2}')
+fi
 
 if [ -z "$vhosts" ]; then
     echo "No vhosts to sample." > /dev/stderr