diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
index 8a3ba7ec3eee83a1c71628d188a7ad1a9b608162..33cc6d4e6f1a06d69b15e7a68899100fb88a6bb1 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
@@ -1,5 +1,6 @@
 package ntnu.idatt2016.v233.SmartMat.controller.group;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import ntnu.idatt2016.v233.SmartMat.entity.Waste;
 import ntnu.idatt2016.v233.SmartMat.service.group.WasteService;
@@ -47,7 +48,7 @@ public class WasteController {
      * @return a ResponseEntity containing the waste if it exists, or a 404 if it doesn't
      */
     @GetMapping("/group/{groupId}")
-    public ResponseEntity<Waste> getWasteByGroupId(@PathVariable("groupId") long groupId) {
+    public ResponseEntity<List<Waste>> getWasteByGroupId(@PathVariable("groupId") long groupId) {
         return wasteService.getWasteByGroupId(groupId)
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.notFound().build());
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
index bdf5c9aac7dbfb5c76555fc2732d35c7f5af1685..e43ed6500c217c74ffb5124f23f061d49c928216 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
@@ -1,10 +1,11 @@
 package ntnu.idatt2016.v233.SmartMat.repository.group;
 
+import java.util.List;
 import ntnu.idatt2016.v233.SmartMat.entity.Waste;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
 public interface WasteRepository extends JpaRepository<Waste, Long> {
-    Optional<Waste> findByGroupId(long groupId);
+    Optional<List<Waste>> findByGroupId(long groupId);
 }
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
index 5982f945d2ec6d82613e0bacfaa9004927a3ca19..f0090491f2f5389410729e8fe5ab203b5305ee1b 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
@@ -1,5 +1,6 @@
 package ntnu.idatt2016.v233.SmartMat.service.group;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import ntnu.idatt2016.v233.SmartMat.entity.Waste;
 import ntnu.idatt2016.v233.SmartMat.repository.group.WasteRepository;
@@ -37,7 +38,7 @@ public class WasteService {
      * @param groupId the id of the group
      * @return an optional containing the waste if it exists
      */
-    public Optional<Waste> getWasteByGroupId(long groupId) {
+    public Optional<List<Waste>> getWasteByGroupId(long groupId) {
         return wasteRepository.findByGroupId(groupId);
     }
 }