diff --git a/src/ClientServer/Config/Constants.cs b/src/ClientServer/Config/Constants.cs
index f253644a4f99aab66f998d41b1ac40f9196c05f6..4aa856689872898a5f28bd39931a553e5072df07 100644
--- a/src/ClientServer/Config/Constants.cs
+++ b/src/ClientServer/Config/Constants.cs
@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
     /// </summary>
     public static class Constants
     {
-        public static string VersionString = "2.5.9";
+        public static string VersionString = "2.5.10";
 
         /// <summary>
         /// this is only set once at program.cs!!
diff --git a/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs b/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
index 267e5f2a8d54a3ea8770e3718412ccc011f2edaf..c2fb0585eee2ca23fef6ae1440491dbf40d42810 100644
--- a/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
@@ -1679,6 +1679,7 @@ namespace ClientServer.Controllers.Core.Exercises
 
                     var assessment = new AssessmentFullBase()
                     {
+                        HasAssessment = solution.Assessment != null,
                         Token = participation.User.Token,
                         FirstName = participation.User.FirstName,
                         LastName = participation.User.LastName,
@@ -1876,6 +1877,7 @@ namespace ClientServer.Controllers.Core.Exercises
 
                     var assessment = new AssessmentFullBase()
                     {
+                        HasAssessment = solution.Assessment != null,
                         Token = participation.User.Token,
                         FirstName = participation.User.FirstName,
                         LastName = participation.User.LastName,
@@ -2190,6 +2192,12 @@ namespace ClientServer.Controllers.Core.Exercises
     /// </summary>
     public class AssessmentFullBase
     {
+        /// <summary>
+        /// true: assessment was != null in the backend
+        /// false: assessment was null e.g. because the automatic assessment hasn't finished yet
+        /// </summary>
+        public bool HasAssessment { get; set; }
+        
         /// <summary>
         /// the token from the user
         /// </summary>
diff --git a/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs b/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
index fcf1e5c1f90334e90e8815b06fbe8abb599c8edc..4c359f73d024a506a1ce0560a8a1d7fd465d7959 100644
--- a/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
@@ -505,6 +505,7 @@ namespace ClientServer.Controllers.Core.Exercises
 
             var assessment = new AssessmentFullBase()
             {
+                HasAssessment = solution.Assessment != null,
                 Token = userReleaseParticipation.User.Token,
                 FirstName = userReleaseParticipation.User.FirstName,
                 LastName = userReleaseParticipation.User.LastName,