diff --git a/Content.Server/Dragon/DragonSystem.Rule.cs b/Content.Server/Dragon/DragonSystem.Rule.cs
index 9fe7f49fba..a7a53be21d 100644
--- a/Content.Server/Dragon/DragonSystem.Rule.cs
+++ b/Content.Server/Dragon/DragonSystem.Rule.cs
@@ -56,11 +56,11 @@ public sealed partial class DragonSystem
 
             if (TryComp<ActorComponent>(dragon.Owner, out var actor))
             {
-                args.AddLine(Loc.GetString("dragon-round-end-dragon-player", ("name", dragon.Owner), ("rifts", met), ("player", actor.PlayerSession)));
+                args.AddLine(Loc.GetString("dragon-round-end-dragon-player", ("name", dragon.Owner), ("count", met), ("player", actor.PlayerSession)));
             }
             else
             {
-                args.AddLine(Loc.GetString("dragon-round-end-dragon", ("name", dragon.Owner), ("rifts", met)));
+                args.AddLine(Loc.GetString("dragon-round-end-dragon", ("name", dragon.Owner), ("count", met)));
             }
         }
     }
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index dfcfebc3b4..22d935989a 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -130,7 +130,7 @@ namespace Content.Server.Dragon
                     comp.State = DragonRiftState.Finished;
                     Dirty(comp);
                 }
-                else
+                else if (comp.State != DragonRiftState.Finished)
                 {
                     comp.Accumulator += frameTime;
                 }