diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 11f9dcd0f..39b77e81d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2012-2015 Florian Schmaus
+ * Copyright 2012-2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
  */
 package org.jivesoftware.smackx.ping;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -105,8 +104,7 @@ public final class PingManager extends Manager {
         defaultPingInterval = interval;
     }
 
-    private final Set<PingFailedListener> pingFailedListeners = Collections
-                    .synchronizedSet(new HashSet<PingFailedListener>());
+    private final Set<PingFailedListener> pingFailedListeners = new CopyOnWriteArraySet<>();
 
     private final ScheduledExecutorService executorService;