diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index 446023973..bd62429e3 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -151,11 +151,10 @@ class TreeDropdownField extends FormField {
 		}
 		
 		// TODO Implement for TreeMultiSelectField
-		if($record) {
-			$metadata = array('id' => $record->ID, 'metadata' => array('ClassName' => $record->ClassName));
-		} else {
-			$metadata = null;
-		}
+		$metadata = array(
+			'id' => $record ? $record->ID : null, 
+			'ClassName' => $record ? $record->ClassName : $this->sourceObject
+		);
 
 		return $this->createTag(
 			'div',