diff --git a/Changelog.txt b/Changelog.txt
index e6f576aa7..26aaf5b93 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
 Version 2.2.002
     Fixed bug where thrown tridents did not grant XP or benefit from subskills
+    Fixed bug where trickshot marked bounced arrows as being shot from a bow instead of being shot from a crossbow
 
 Version 2.2.001
     Fixed Crossbow's Powered shot showing the text for the wrong skill from the locale when using /crossbows command
diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
index 60def74bf..75d7e5d23 100644
--- a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
@@ -72,6 +72,7 @@ public class CrossbowsManager extends SkillManager {
                 new FixedMetadataValue(pluginRef, bounceCount + 1));
         spawnedArrow.setMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW,
                 new FixedMetadataValue(pluginRef, originalArrowShooter));
+        spawnedArrow.setShotFromCrossbow(true);
 
         // Don't allow multi-shot or infinite arrows to be picked up
         if (spawnedArrow.hasMetadata(MetadataConstants.METADATA_KEY_MULTI_SHOT_ARROW)