diff --git a/src/main/java/net/spy/memcached/MemcachedClient.java b/src/main/java/net/spy/memcached/MemcachedClient.java
index 77d0f048e..95cda6641 100644
--- a/src/main/java/net/spy/memcached/MemcachedClient.java
+++ b/src/main/java/net/spy/memcached/MemcachedClient.java
@@ -2484,11 +2484,13 @@ public void shutdown() {
   @Override
   public boolean shutdown(long timeout, TimeUnit unit) {
     // Guard against double shutdowns (bug 8).
-    if (shuttingDown) {
-      getLogger().info("Suppressing duplicate attempt to shut down");
-      return false;
+    synchronized (this) {
+        if (shuttingDown) {
+          getLogger().info("Suppressing duplicate attempt to shut down");
+          return false;
+        }
+        shuttingDown = true;
     }
-    shuttingDown = true;
     String baseName = mconn.getName();
     mconn.setName(baseName + " - SHUTTING DOWN");
     boolean rv = true;