diff --git a/README.md b/README.md
index 6da2bfb..9ffc796 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Interaction Bubbles
 
-![Mod Version](https://img.shields.io/badge/Mod_Version-2.7-blue)
+![Mod Version](https://img.shields.io/badge/Mod_Version-2.8-blue)
 ![RimWorld Version](https://img.shields.io/badge/Built_for_RimWorld-1.4-blue)
 ![Harmony Version](https://img.shields.io/badge/Powered_by_Harmony-2.2.2-blue)\
 [![Steam Subscribers](https://img.shields.io/steam/downloads/1516158345?color=blue&label=Steam%20Downloads&logo=Steam)](https://steamcommunity.com/sharedfiles/filedetails/?id=1516158345)
diff --git a/source/Core/Bubbler.cs b/source/Core/Bubbler.cs
index 64fb517..c8dd770 100644
--- a/source/Core/Bubbler.cs
+++ b/source/Core/Bubbler.cs
@@ -65,11 +65,7 @@ private static void DrawBubble(Pawn pawn, bool isSelected, float scale)
       foreach (var bubble in Dictionary[pawn].OrderByDescending(static bubble => bubble.Entry.Tick).ToArray())
       {
         if (count > Settings.PawnMax.Value) { return; }
-        if (!bubble.Draw(pos + GetOffset(offset), isSelected, scale))
-        {
-          Remove(pawn, bubble);
-          if (Dictionary[pawn].NullOrEmpty()) { Dictionary.Remove(pawn); }
-        }
+        if (!bubble.Draw(pos + GetOffset(offset), isSelected, scale)) { Remove(pawn, bubble); }
         offset += (Settings.OffsetDirection.Value.IsHorizontal ? bubble.Width : bubble.Height) + Settings.OffsetSpacing.Value;
         count++;
       }
diff --git a/source/Mod.cs b/source/Mod.cs
index b2a99ee..79f390e 100644
--- a/source/Mod.cs
+++ b/source/Mod.cs
@@ -9,7 +9,7 @@ public sealed class Mod : Verse.Mod
   {
     public const string Id = "Bubbles";
     public const string Name = "Interaction Bubbles";
-    public const string Version = "2.7";
+    public const string Version = "2.8";
 
     public static Mod Instance = null!;