diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 1dc490d8..5e3ee79f 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -4044,7 +4044,6 @@ namespace TShockAPI
 			{
 				tsply.SaveServerCharacter();
 			}
-			args.Player.SendSuccessMessage("Save succeeded.");
 		}
 
 		private static void Settle(CommandArgs args)
diff --git a/TShockAPI/SaveManager.cs b/TShockAPI/SaveManager.cs
index 54b2af98..c0af6d42 100644
--- a/TShockAPI/SaveManager.cs
+++ b/TShockAPI/SaveManager.cs
@@ -55,7 +55,7 @@ namespace TShockAPI
 				// These can be caused by an unexpected error such as a bad or out of date plugin
 				try
 				{
-					TShock.Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
+					TShock.Utils.Broadcast("Saving world...", Color.Yellow);
 				}
 				catch (Exception ex)
 				{
@@ -130,8 +130,11 @@ namespace TShockAPI
 								}
 								else
 									WorldFile.SaveWorld(task.resetTime);
+
+								if (TShock.Config.AnnounceSave)
 									TShock.Utils.Broadcast("World saved.", Color.Yellow);
-									TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
+
+								TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
 							}
 							catch (Exception e)
 							{