diff --git a/src/main/java/core/rating/RatingPredictionModel.java b/src/main/java/core/rating/RatingPredictionModel.java
index f5981449f..b7f49e682 100644
--- a/src/main/java/core/rating/RatingPredictionModel.java
+++ b/src/main/java/core/rating/RatingPredictionModel.java
@@ -1721,7 +1721,7 @@ protected double calcLongshots(@NotNull Lineup lineup, int minute) {
         }
 
         //Tactic Level = 1.66*SC + 0.55*SP - 7.6
-        return 1.66 * sumScoring / n + 0.55 * sumSetPieces / n - 7.6;
+        return max(0, (1.66 * sumScoring + 0.55 * sumSetPieces) / n - 7.6);
     }
 
     /**
diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md
index b49eb1e41..a5de3bc1c 100644
--- a/src/main/resources/release_notes.md
+++ b/src/main/resources/release_notes.md
@@ -17,6 +17,7 @@
 * Fix display of best position rating (#2166)
 * Display coach conversion costs (#2204)
 * New column "trainer notes" (#2229)
+* Fix long shot rating calculation (#2237)
 
 ### Team Analyzer