diff --git a/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeTask.java b/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeTask.java
index 033096d2..7e87ec13 100644
--- a/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeTask.java
+++ b/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeTask.java
@@ -76,6 +76,11 @@ public class BungeeTask implements Runnable, ScheduledTask
             }
         }
 
-        sched.cancel( this );
+        // We might have been previously running before, but now we aren't.
+        // If we weren't already cancelled, then cancel ourselves.
+        if ( running.get() )
+        {
+            sched.cancel( this );
+        }
     }
 }