diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index 71d487cfc981054d8e79bf1db1c9570465f6c158..f06f13638eba40806db40747f377ef80f02bf261 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -324,7 +324,7 @@ public class ForecastBean {
                 .setParameter("organizationIds", organizationIds)
                 .getResultList();
         
-        if(!organizationUsers.isEmpty())
+        if(!organizationUsers.isEmpty() && ! modelIds.isEmpty())
         {
             return em
                     .createNamedQuery("ForecastConfiguration.findByVipsLogicUserIdsAndModelIdsAndDate")