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 522282e8947937f9b03f6ec1150954a958b04bc9..02b4266434c4dcddd63c9a7fe411a058c6a4a182 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
@@ -2,6 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.repository.group;
 
 import java.util.List;
 import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -9,7 +10,7 @@ import org.springframework.data.repository.query.Param;
 import java.util.Optional;
 
 public interface WasteRepository extends JpaRepository<Waste, Long> {
-    Optional<List<Waste>> findByGroupId(long groupId);
+    Optional<List<Waste>> findByGroupId( Group 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 59a76ebac0f4042a2db27146e4ab88ee5786ab45..768105a2cb8d03825848660ec2baada8647739f0 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
@@ -47,7 +47,9 @@ public class WasteService {
      * @return an optional containing the waste if it exists
      */
     public Optional<List<Waste>> getWasteByGroupId(long groupId) {
-        return wasteRepository.findByGroupId(groupId);
+        Optional<Group> group = groupRepository.findByGroupId(groupId);
+        if(group.isPresent()) return wasteRepository.findByGroupId(group.get());
+        return Optional.empty();
     }
 
     /**