diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4128f539a..6eac775e7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -23,6 +23,7 @@
  - fixed: Users without karma can transfer karma by rating posts
  - fixed: gateway macro not usable in links in rich editor
  - fixed: iCal feeds don't update properly when events are changed
+ - fixed: getLineage with joinClass only joins first table in definition
 
 7.5.9
  - fixed: Collaboration System attachments follow site's max size instead of CS's
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 0f2205dba..430edd1e9 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -398,11 +398,10 @@ sub getLineage {
             $self->session->errorHandler->fatal("Couldn't compile asset package: ".$className.". Root cause: ".$@) if ($@);
         }
 		foreach my $definition (@{$className->definition($self->session)}) {
-			unless ($definition->{tableName} eq "asset") {
+            unless ($definition->{tableName} eq "asset" || $definition->{tableName} eq "assetData") {
 				my $tableName = $definition->{tableName};
 				$tables .= " left join $tableName on assetData.assetId=".$tableName.".assetId and assetData.revisionDate=".$tableName.".revisionDate";
 			}
-			last;
 		}
 	}
 	# formulate a where clause