diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c86d7e5c99..01cf763f24 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -40,7 +40,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public void setOp(boolean value) {
-        server.getHandle().e(getName());
+        if (value == isOp()) return;
+
+        if (value) {
+            server.getHandle().e(getName());
+        } else {
+            server.getHandle().f(getName());
+        }
     }
 
     public boolean isPlayer() {