diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ea08860..b73ffbe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 
 ## TShock 4.5.2
 * Added preliminary support for Terraria 1.4.2.2. (@hakusaro)
+* Removed `/ungodmode` and godmode warning (no longer necessary). Also, godmode now supports silent commands. (@hakusaro)
 
 ## TShock 4.5.1
 * Fixed server crash from `/v2/players/list` & other parameterised REST endpoints. (@QuiCM, reported by @ATFGK)
diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index e71d604c..601c2591 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -545,11 +545,6 @@ namespace TShockAPI
 			{
 				HelpText = "Toggles godmode on a player."
 			});
-			add(new Command("", ForceUngod, "ungodme")
-			{
-				HelpText = "Removes godmode from your character.",
-				AllowServer = false
-			});
 			add(new Command(Permissions.heal, Heal, "heal")
 			{
 				HelpText = "Heals a player in HP and MP."
@@ -6461,17 +6456,10 @@ namespace TShockAPI
 				args.Player.SendSuccessMessage(string.Format("{0} is {1} in god mode.", playerToGod.Name, playerToGod.GodMode ? "now" : "no longer"));
 			}
 
-			playerToGod.SendSuccessMessage(string.Format("You are {0} in god mode.", args.Player.GodMode ? "now" : "no longer"));
-			playerToGod.SendInfoMessage("Please make sure to disable godmode using /ungodme before disconnecting, otherwise your character may remain in godmode indefinitely, including singleplayer.");
-		}
-
-		private static void ForceUngod(CommandArgs args)
-		{
-			var godPower = CreativePowerManager.Instance.GetPower<CreativePowers.GodmodePower>();
-
-			godPower.SetEnabledState(args.Player.Index, false);
-
-			args.Player.SendSuccessMessage("Journey Godmode has been disabled on your character.");
+			if (!args.Silent || (playerToGod == args.Player))
+			{
+				playerToGod.SendSuccessMessage(string.Format("You are {0} in god mode.", args.Player.GodMode ? "now" : "no longer"));
+			}
 		}
 
 		#endregion Cheat Comamnds