diff --git a/src/main/java/ch/progetto152/entity/WaypointsVisitedEntity.java b/src/main/java/ch/progetto152/entity/WaypointsVisitedEntity.java
index 5329215..7504f46 100644
--- a/src/main/java/ch/progetto152/entity/WaypointsVisitedEntity.java
+++ b/src/main/java/ch/progetto152/entity/WaypointsVisitedEntity.java
@@ -3,8 +3,8 @@ package ch.progetto152.entity;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.io.Serializable;
 import java.util.Objects;
-
 @Entity
 @Getter
 @Setter
@@ -12,12 +12,11 @@ import java.util.Objects;
 @AllArgsConstructor
 @ToString
 @Table(name = "WaypointsVisited", schema = "Progetto152", catalog = "")
+@IdClass(WaypointsVisitedId.class)
 public class WaypointsVisitedEntity {
-    @Basic
     @Id
     @Column(name = "userId")
     private int userId;
-    @Basic
     @Id
     @Column(name = "waypointId")
     private int waypointId;
@@ -39,3 +38,8 @@ public class WaypointsVisitedEntity {
         return Objects.hash(userId, waypointId);
     }
 }
+
+class WaypointsVisitedId implements Serializable {
+    private int userId;
+    private int waypointId;
+}