diff --git a/src/includes/class/class.LSattribute.php b/src/includes/class/class.LSattribute.php
index cffc6360..fa5b4e6a 100644
--- a/src/includes/class/class.LSattribute.php
+++ b/src/includes/class/class.LSattribute.php
@@ -256,15 +256,9 @@ class LSattribute extends LSlog_staticLoggerClass {
       return false;
     }
 
-    if ($data !== false) {
-      $data = $this -> ldap -> getDisplayValue($data);
-    }
-    elseif ($this -> isUpdate()) {
-      $data = $this -> ldap -> getDisplayValue($this -> updateData);
-    }
-    else {
-      $data = $this -> ldap -> getDisplayValue($this -> data);
-    }
+    $data = $this -> ldap -> getDisplayValue(
+      $data !== false ? $data : $this -> getValue()
+    );
 
     $onDisplay = $this -> getConfig('onDisplay');
     if ($onDisplay) {