diff --git a/nms-patches/net/minecraft/server/commands/CommandTrigger.patch b/nms-patches/net/minecraft/server/commands/CommandTrigger.patch
new file mode 100644
index 000000000..82f7e7615
--- /dev/null
+++ b/nms-patches/net/minecraft/server/commands/CommandTrigger.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandTrigger.java
++++ b/net/minecraft/server/commands/CommandTrigger.java
+@@ -90,7 +90,7 @@
+         if (scoreboardobjective.getCriteria() != IScoreboardCriteria.TRIGGER) {
+             throw CommandTrigger.ERROR_INVALID_OBJECTIVE.create();
+         } else {
+-            Scoreboard scoreboard = entityplayer.getScoreboard();
++            Scoreboard scoreboard = entityplayer.getServer().getScoreboard(); // CraftBukkit - SPIGOT-6917: use main scoreboard
+             String s = entityplayer.getScoreboardName();
+ 
+             if (!scoreboard.hasPlayerScore(s, scoreboardobjective)) {