diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index f27f3c5df3c2590ebae0c11c6b4c30b8bd4d58c1..515e588966fc17a90c3c5310d719a4198a6e230c 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -64,8 +64,6 @@ class SetAttribute extends Attribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]["count"]; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 
@@ -429,8 +427,6 @@ class OrderedArrayAttribute extends SetAttribute
           $this->value[] = $value;
         }
       }
-    } else {
-      $this->resetToDefault();
     }
     if ($this->order) {
       $this->reIndexValues();
@@ -706,8 +702,6 @@ class SubNodesAttribute extends OrderedArrayAttribute
         unset($attribute);
         $this->value[] = $this->attribute->getValue();
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 83f063dac1d628122676c6f2650b071a812ec74d..fb76a203de98f962f0dcd5aa2514cb573a9f1671 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -777,8 +777,6 @@ class HiddenArrayAttribute extends HiddenAttribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 }
@@ -859,8 +857,6 @@ class DisplayLDAPArrayAttribute extends Attribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }