diff --git a/examples/monome.clj b/examples/monome.clj
index dc8097c23..340d44833 100644
--- a/examples/monome.clj
+++ b/examples/monome.clj
@@ -47,7 +47,7 @@
       (on "/n_end" (fn [msg]
                      (if (= id (first (:args msg)))
                        (mono/led-off m x y))
-                     :done)))))
+                     :overtone/remove-handler)))))
 
 (def loops
  [[1 0 0 0 1 0 0 0]
diff --git a/src/overtone/sc/buffer.clj b/src/overtone/sc/buffer.clj
index 972c0508e..901396464 100644
--- a/src/overtone/sc/buffer.clj
+++ b/src/overtone/sc/buffer.clj
@@ -244,7 +244,7 @@
 
     (snd "/b_write" (:id buf) path header samples
                     n-frames start-frame 0)
-    :done))
+    :overtone/remove-handler))
 
 (defrecord BufferOutStream [id size n-channels header samples rate allocated-on-server path open?])
 
diff --git a/src/overtone/sc/info.clj b/src/overtone/sc/info.clj
index 046e614e7..e10197d32 100644
--- a/src/overtone/sc/info.clj
+++ b/src/overtone/sc/info.clj
@@ -54,7 +54,7 @@
                             :num-audio-buses (long nab)
                             :num-buffers (long nb)
                             :num-running-synths (long nrs)})
-                  :done))
+                  :overtone/remove-handler))
               ::server-info)
     (let [synth-id (snd-server-info)
           res (deref! prom)]
diff --git a/src/overtone/sc/machinery/server/comms.clj b/src/overtone/sc/machinery/server/comms.clj
index 4bc43c135..c0108b386 100644
--- a/src/overtone/sc/machinery/server/comms.clj
+++ b/src/overtone/sc/machinery/server/comms.clj
@@ -57,7 +57,7 @@
               (fn [msg] (when (= id (first (:args msg)))
                          (do
                            (handler-fn)
-                           :done)))
+                           :overtone/remove-handler)))
               key)
 
     (let [res (action-fn)]
@@ -86,7 +86,7 @@
               (fn [msg] (when (= id (first (:args msg)))
                          (do
                            (deliver prom true)
-                           :done)))
+                           :overtone/remove-handler)))
               key)
     (let [res (action-fn id)]
       (deref! prom)
@@ -103,7 +103,7 @@
               (fn [msg] (when (= id (first (:args msg)))
                          (do
                            (deliver prom true)
-                           :done)))
+                           :overtone/remove-handler)))
               key)
     (let [res (action-fn)]
       (server-snd "/sync" id)
@@ -128,6 +128,6 @@
                         (when (or (nil? matcher-fn)
                                   (matcher-fn info))
                           (deliver p info)
-                          :done))
+                          :overtone/remove-handler))
                       key)
     p)))
diff --git a/src/overtone/sc/sample.clj b/src/overtone/sc/sample.clj
index 05af2f604..372aa7527 100644
--- a/src/overtone/sc/sample.clj
+++ b/src/overtone/sc/sample.clj
@@ -141,7 +141,7 @@
         args (:args smpl)
         buf  (get @loaded-samples* [path args])]
     (free-loaded-sample [[path args] buf])
-    :done))
+    :overtone/remove-handler))
 
 (defn sample-player
   [smpl & pargs]