diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
index 17fd9269f..42fa7802d 100644
--- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java
+++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java
@@ -108,9 +108,10 @@ public class CustomNpcsPermissions{
 
 	public static boolean hasPermission(EntityPlayer player, Permission permission){
 		if(player != null){
-			if(Developer.Instance.hasUniversal(player.getUniqueID())){
+            if(NoppesUtilServer.isOp(player))
+                return true;
+			if(Developer.Instance.hasUniversal(player.getUniqueID()))
 				return true;
-			}
 			if(permission != null){
 				if(Instance.bukkit != null){
 					return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);