diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
index 174726de8bf5dd0ffb61db4170d3307136c190e0..549375f076bbb14aa1ce88765fa96dab6bd334de 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
@@ -34,7 +34,8 @@ public class ShoppingList {
     long shoppingListID;
 
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id")
     private Group group;
 
     @ManyToMany
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
index bc0c0265265e8ae108e0144beac42a2bd52f9182..c1218a32a25d65dc079e3936654601fd4c8c09f7 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
@@ -50,7 +50,7 @@ public class Group {
     @Column(name = "is_open")
     Boolean open;
 
-    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "group")
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JsonIgnoreProperties("groupId")
     private ShoppingList shoppingList;
@@ -71,8 +71,7 @@ public class Group {
         this.user.add(userGroupTable);
     }
 
-    @OneToOne
-    @JoinColumn(name = "group_id")
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "group")
     @JsonIgnoreProperties("group")
     @OnDelete(action = OnDeleteAction.CASCADE)
     private Fridge fridge;