diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 37abcd4fd..a69eb53ae 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1278,9 +1278,10 @@ public class Base {
               continue;
             boolean firstRefBoardBlock = true;
             for (TargetBoard board : platf.getBoards().values()) {
-              if (board.getReferencedPackageId() == null)
+              String ref = board.getReferencedPackageId();
+              if (ref == null || !ref.equals(targetPackage.getId()))
                 continue;
-
+              
               // Add a separator from the previous platform
               if (firstRefBoardBlock)
                 boardsMenu.add(new JSeparator());