diff --git a/examples/edit.js b/examples/edit.js
index 20ff431ead..c1819cfc30 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -345,7 +345,7 @@ var toolBar = (function() {
             if (active && !Entities.canAdjustLocks()) {
                 Window.alert(INSUFFICIENT_PERMISSIONS_ERROR_MSG);
             } else {
-                Messages.sendMessage("edit-events", JSON.stringify({enabled: active}));
+                Messages.sendLocalMessage("edit-events", JSON.stringify({enabled: active}));
                 isActive = active;
                 if (!isActive) {
                     entityListTool.setVisible(false);
diff --git a/examples/grab.js b/examples/grab.js
index e1b3cb87d3..3b6c79977e 100644
--- a/examples/grab.js
+++ b/examples/grab.js
@@ -565,13 +565,16 @@ function keyReleaseEvent(event) {
     grabber.keyReleaseEvent(event);
 }
 
-function editEvent(channel, message, sender) {
+function editEvent(channel, message, sender, localOnly) {
     if (channel != "edit-events") {
         return;
     }
     if (sender != MyAvatar.sessionUUID) {
         return;
     }
+    if (!localOnly) {
+        return;
+    }
     try {
         data = JSON.parse(message);
         if ("enabled" in data) {