diff --git a/library/Director/Web/Form/IcingaObjectFieldLoader.php b/library/Director/Web/Form/IcingaObjectFieldLoader.php
index cd3ce093..e8feec32 100644
--- a/library/Director/Web/Form/IcingaObjectFieldLoader.php
+++ b/library/Director/Web/Form/IcingaObjectFieldLoader.php
@@ -146,16 +146,17 @@ class IcingaObjectFieldLoader
 
     protected function loadDataFieldsForObjects($objectList)
     {
-        if (empty($objectList)) {
-            // Or should we fail?
-            return array();
-        }
-
         $ids = array();
         $objects = array();
         foreach ($objectList as $object) {
-            $ids[] = $object->id;
-            $objects[$object->id] = $object;
+            if ($object->hasBeenLoadedFromDb()) {
+                $ids[] = $object->id;
+                $objects[$object->id] = $object;
+            }
+        }
+
+        if (empty($ids)) {
+            return array();
         }
 
         $connection = $object->getConnection();