diff --git a/Tsi1.Api/Tsi1.DataLayer/Entities/Activity.cs b/Tsi1.Api/Tsi1.DataLayer/Entities/Activity.cs
index 7a1bd8821c973b2637aa69f59160f1eff4b37a02..2dcbb58806597bc138c36e9289dfa625e1f08091 100644
--- a/Tsi1.Api/Tsi1.DataLayer/Entities/Activity.cs
+++ b/Tsi1.Api/Tsi1.DataLayer/Entities/Activity.cs
@@ -9,7 +9,6 @@ namespace Tsi1.DataLayer.Entities
         public Activity()
         {
             Attendances = new HashSet<Attendance>();
-            Grades = new HashSet<Grade>();
         }
 
         public int Id { get; set; }
@@ -27,7 +26,5 @@ namespace Tsi1.DataLayer.Entities
         public Evaluation Evaluation { get; set; }
 
         public ICollection<Attendance> Attendances { get; set; }
-
-        public ICollection<Grade> Grades { get; set; }
     }
 }
diff --git a/Tsi1.Api/Tsi1.DataLayer/Entities/Evaluation.cs b/Tsi1.Api/Tsi1.DataLayer/Entities/Evaluation.cs
index aa1b5dcc436a82215c1abf121a4c15c093bf2b1a..d34c65c727a732b21bb00dadd1dc545d19a8a89a 100644
--- a/Tsi1.Api/Tsi1.DataLayer/Entities/Evaluation.cs
+++ b/Tsi1.Api/Tsi1.DataLayer/Entities/Evaluation.cs
@@ -17,6 +17,9 @@ namespace Tsi1.DataLayer.Entities
 
         public bool IsCompleted { get; set; }
 
+
+        public Activity Activity { get; set; }
+
         public EvaluationType EvaluationType { get; set; }
 
         public ICollection<EvaluationInscription> EvaluationInscriptions { get; set; }
diff --git a/Tsi1.Api/Tsi1.DataLayer/Entities/Student.cs b/Tsi1.Api/Tsi1.DataLayer/Entities/Student.cs
index cc7772d5bad7a1b931c68d25a98aee71cb3a6ffe..82d423ab4a5533fd329ece9f79bc7d54c85de3f4 100644
--- a/Tsi1.Api/Tsi1.DataLayer/Entities/Student.cs
+++ b/Tsi1.Api/Tsi1.DataLayer/Entities/Student.cs
@@ -10,7 +10,6 @@ namespace Tsi1.DataLayer.Entities
         {
             StudentCourses = new HashSet<StudentCourse>();
             EvaluationInscriptions = new HashSet<EvaluationInscription>();
-            Grades = new HashSet<Grade>();
             Submissions = new HashSet<Submission>();
         }
 
@@ -26,8 +25,6 @@ namespace Tsi1.DataLayer.Entities
         public User User { get; set; }
         public ICollection<StudentCourse> StudentCourses { get; set; }
 
-        public ICollection<Grade> Grades { get; set; }
-
         public ICollection<EvaluationInscription> EvaluationInscriptions { get; set; }
 
         public ICollection<Submission> Submissions { get; set; }
diff --git a/Tsi1.Api/Tsi1.DataLayer/EntityConfiguration/ActivityConfiguration.cs b/Tsi1.Api/Tsi1.DataLayer/EntityConfiguration/ActivityConfiguration.cs
index bb240989a2fd94ea21c55cf70fe94ffb6f144f78..b967312867456f0b32c3bfb68aaa05d9f4f2b3bb 100644
--- a/Tsi1.Api/Tsi1.DataLayer/EntityConfiguration/ActivityConfiguration.cs
+++ b/Tsi1.Api/Tsi1.DataLayer/EntityConfiguration/ActivityConfiguration.cs
@@ -20,6 +20,10 @@ namespace Tsi1.DataLayer.EntityConfiguration
             builder.HasOne(x => x.Course)
                 .WithMany(x => x.Activities)
                 .HasForeignKey(x => x.CourseId);
+
+            builder.HasOne(x => x.Evaluation)
+                .WithOne(x => x.Activity)
+                .HasForeignKey<Activity>(x => x.EvaluationId);
         }
     }
 }