diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index d0772aeb2..af541b8c4 100644
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1489,6 +1489,12 @@ public class NPCCommands {
             npc.data().setPersistent(NPC.AMBIENT_SOUND_METADATA, ambientSound);
         }
 
+        if (ambientSound.isEmpty())
+            ambientSound = "none";
+        if (hurtSound.isEmpty())
+            hurtSound = "none";
+        if (deathSound.isEmpty())
+            deathSound = "none";
         Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound);
     }
 
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 43442f296..6642b8e28 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -4,9 +4,9 @@ citizens.commands.console-error=Please report this error: [See console]
 citizens.commands.errors.missing-world=World not found.
 citizens.commands.help.command-missing=Command /{0} not found.
 citizens.commands.help.header=Help
-citizens.commands.id-not-found=Couldn''t find any NPC with ID {0}.
+citizens.commands.id-not-found=Couldn''t find any NPC with ID [[{0}]].
 citizens.commands.invalid.class=Invalid external commands class.
-citizens.commands.invalid-mobtype={0} is not a valid mobtype.
+citizens.commands.invalid-mobtype=[[{0}]] is not a valid mobtype.
 citizens.commands.invalid-number=That is not a valid number.
 citizens.commands.npc.age.cannot-be-aged=The mob type {0} cannot be aged.
 citizens.commands.npc.age.help=Can only be used on entities that can become babies. Use the [[-l]] flag to lock age over time (note: relogs may be required to see this).
@@ -18,9 +18,9 @@ citizens.commands.npc.age.set-normal=[[{0}]] is now age [[{1}]].
 citizens.commands.npc.age.set=[[{0}]] is now [[{1}]].
 citizens.commands.npc.age.unlocked=Age unlocked.
 citizens.commands.npc.anchor.added=Anchor added.
-citizens.commands.npc.anchor.already-exists=The anchor {0} already exists.
+citizens.commands.npc.anchor.already-exists=The anchor [[{0}]] already exists.
 citizens.commands.npc.anchor.invalid-name=Invalid anchor name.
-citizens.commands.npc.anchor.missing=The anchor {1} does not exist.
+citizens.commands.npc.anchor.missing=The anchor [[{1}]] does not exist.
 citizens.commands.npc.anchor.removed=Anchor removed.
 citizens.commands.npc.behaviour.added=Behaviours added.
 citizens.commands.npc.behaviour.help=The scripts argument is a comma-separated list of file names. Scripts will be loaded automatically and run every tick. Use the [[-r]] flag to remove behaviours.
@@ -62,13 +62,13 @@ citizens.commands.npc.lookclose.stopped=[[{0}]] will no longer rotate when playe
 citizens.commands.npc.minecart.set=[[{0}]] now has item [[{1}]]:[[{2}]] with offset [[{3}]].
 citizens.commands.npc.mount.failed=Couldn''t mount [[{0}]].
 citizens.commands.npc.moveto.format=Format is x:y:z(:world) or x y z( world).
-citizens.commands.npc.moveto.teleported=[[{0}]] teleported to {1}.
+citizens.commands.npc.moveto.teleported=[[{0}]] teleported to [[{1}]].
 citizens.commands.npc.nameplate.toggled=Nameplate visibility toggled.
 citizens.commands.npc.ocelot.invalid-type=Invalid ocelot type. Valid types are: [[{0}]].
-citizens.commands.npc.owner.already-owner={0} is already the owner of {1}.
+citizens.commands.npc.owner.already-owner={0} is already the owner of [[{1}]].
 citizens.commands.npc.owner.owner=[[{0}]]''s owner is [[{1}]].
-citizens.commands.npc.owner.set-server=[[The server]] is now the owner of {0}.
-citizens.commands.npc.owner.set=[[{1}]] is now the owner of {0}.
+citizens.commands.npc.owner.set-server=[[The server]] is now the owner of [[{0}]].
+citizens.commands.npc.owner.set=[[{1}]] is now the owner of [[{0}]].
 citizens.commands.npc.passive.set=[[{0}]] will no longer damage entities.
 citizens.commands.npc.passive.unset=[[{0}]] will now damage entities.
 citizens.commands.npc.pathfindingrange.set=Pathfinding range set to [[{0}]].
@@ -100,11 +100,11 @@ citizens.commands.npc.select.already-selected=You already have that NPC selected
 citizens.commands.npc.skin.set=[[{0}]]''s skin name set to [[{1}]].
 citizens.commands.npc.skin.cleared=[[{0}]]''s skin name was cleared.
 citizens.commands.npc.skin.layers-set=[[{0}]]''s skin layers: cape - [[{1}]], hat - [[{2}]], jacket - [[{3}]], sleeves - [[{4}]], pants - [[{5}]].
-citizens.commands.npc.size.description={0}''s size is [[{1}]].
-citizens.commands.npc.size.set={0}''s size set to [[{1}]].
+citizens.commands.npc.size.description=[[{0}]]''s size is [[{1}]].
+citizens.commands.npc.size.set=[[{0}]]''s size set to [[{1}]].
 citizens.commands.npc.sound.invalid-sound=Invalid sound.
-citizens.commands.npc.sound.set={0}''s sounds are now: ambient - [[{1}]] hurt - [[{2}]] and death - [[{3}]].
-citizens.commands.npc.sound.info={0}''s sounds are: ambient - [[{1}]] hurt - [[{2}]] and death - [[{3}]].<br><br>Valid sounds are {4}.
+citizens.commands.npc.sound.set=[[{0}]]''s sounds are now: ambient - [[{1}]] hurt - [[{2}]] and death - [[{3}]].
+citizens.commands.npc.sound.info=[[{0}]]''s sounds are: ambient - [[{1}]] hurt - [[{2}]] and death - [[{3}]].<br><br>Valid sounds are {4}.
 citizens.commands.npc.skeletontype.set={0}''s skeleton type set to [[{1}]].
 citizens.commands.npc.skeletontype.invalid-type=Invalid skeleton type. Try one of the following: [[{0}]].
 citizens.commands.npc.spawn.already-spawned=[[{0}]] is already spawned at another location. Use ''/npc tphere'' to teleport the NPC to your location.
@@ -237,7 +237,7 @@ citizens.limits.over-npc-limit=Over the NPC limit of {0}.
 citizens.load-task-error=NPC load task couldn''t be scheduled, disabling...
 citizens.nms-errors.clearing-goals=Could not clear goals: {0}.
 citizens.nms-errors.error-setting-persistent=Could not set NPC as persistent: {0}. NPC entity may despawn.
-citizens.nms-errors.getting-field=Could not fetch NMS field {0}: {1}.
+citizens.nms-errors.getting-field=Could not fetch NMS field {0}: [[{1}.
 citizens.nms-errors.getting-id-mapping=Could not fetch entity id mapping fields: {0}.
 citizens.nms-errors.spawning-custom-entity=Could not spawn custom entity: {0}.
 citizens.nms-errors.stopping-network-threads=Could not stop network threads: {0}.