diff --git a/MareSynchronos/Models/FileReplacement.cs b/MareSynchronos/Models/FileReplacement.cs
index 5b345d0..a9b696b 100644
--- a/MareSynchronos/Models/FileReplacement.cs
+++ b/MareSynchronos/Models/FileReplacement.cs
@@ -40,7 +40,7 @@ namespace MareSynchronos.Models
                 FileCache? fileCache;
                 using (FileCacheContext db = new())
                 {
-                    fileCache = db.FileCaches.LastOrDefault(f => f.Filepath == path.ToLower());
+                    fileCache = db.FileCaches.FirstOrDefault(f => f.Filepath == path.ToLower());
                 }
 
                 if (fileCache != null)
diff --git a/MareSynchronos/Models/PlayerRelatedObject.cs b/MareSynchronos/Models/PlayerRelatedObject.cs
index 012815a..08b4393 100644
--- a/MareSynchronos/Models/PlayerRelatedObject.cs
+++ b/MareSynchronos/Models/PlayerRelatedObject.cs
@@ -113,6 +113,8 @@ namespace MareSynchronos.Models
                     hasChanges = true;
                 }
 
+                newWeaponOrVisorState &= 0b1101; // ignore drawing weapon
+
                 if (newWeaponOrVisorState != VisorWeaponState)
                 {
                     if (VisorWeaponState != null && !hasChanges && !HasUnprocessedUpdate)