diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index dad22bdee..ac1611eda 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+## Release Notes 3.11.1
+
+## Bugfixes
+- **Tables / PUP Packs**: Fixed wrong order of PUP pack detection when an alias was used.
+
 ## Release Notes 3.11.0
 
 ## Changes
diff --git a/vpin-studio-server/src/main/java/de/mephisto/vpin/server/puppack/PupPacksService.java b/vpin-studio-server/src/main/java/de/mephisto/vpin/server/puppack/PupPacksService.java
index cb9d180bb..937869660 100644
--- a/vpin-studio-server/src/main/java/de/mephisto/vpin/server/puppack/PupPacksService.java
+++ b/vpin-studio-server/src/main/java/de/mephisto/vpin/server/puppack/PupPacksService.java
@@ -79,12 +79,12 @@ private PupPack getCachedPupPack(@NonNull Game game) {
     if (!StringUtils.isEmpty(game.getPupPackName()) && pupPackFolders.containsKey(game.getPupPackName().toLowerCase())) {
       return pupPackFolders.get(game.getPupPackName().toLowerCase());
     }
-    if (!StringUtils.isEmpty(game.getRom()) && pupPackFolders.containsKey(game.getRom().toLowerCase())) {
-      return pupPackFolders.get(game.getRom().toLowerCase());
-    }
     if (!StringUtils.isEmpty(game.getRomAlias()) && pupPackFolders.containsKey(game.getRomAlias().toLowerCase())) {
       return pupPackFolders.get(game.getRomAlias().toLowerCase());
     }
+    if (!StringUtils.isEmpty(game.getRom()) && pupPackFolders.containsKey(game.getRom().toLowerCase())) {
+      return pupPackFolders.get(game.getRom().toLowerCase());
+    }
     if (!StringUtils.isEmpty(game.getTableName()) && pupPackFolders.containsKey(game.getTableName().toLowerCase())) {
       return pupPackFolders.get(game.getTableName().toLowerCase());
     }