diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php
index 827bdc989..c5f0d3e98 100644
--- a/application/libraries/UDFLib.php
+++ b/application/libraries/UDFLib.php
@@ -312,10 +312,10 @@ class UDFLib
 			{
 				$resultElement->{$columnName} = $columnValue;
 			}
-		}
 
-		// And finally remove the UDFs column
-		unset($resultElement->{self::COLUMN_NAME});
+			// And finally remove the UDFs column
+			unset($resultElement->{self::COLUMN_NAME});
+		}
 	}
 
 	/**