diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 2f1c3a9e591884f71401fce6f14f7a72fe855f03..1b31e882d75025c248c48969627a2af75d617471 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -1011,12 +1011,10 @@ class DynamicFormEntryAnswer extends VerySimpleModel {
     }
 
     function getValue() {
-        $value = $this->getField()->to_php(
-            $this->get('value'), $this->get('value_id'));
-        if (!$value && $this->getEntry()->getSource()) {
-            return $this->getEntry()->getField(
-                $this->getField()->get('name'))->getClean();
-        }
+        if (!$this->_value && isset($this->value))
+            $this->_value = $this->getField()->to_php(
+                $this->get('value'), $this->get('value_id'));
+        return $this->_value;
     }
 
     function getIdValue() {