diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php
index a7db6024e42ff823976a6fe6b4d73ecfb8187c90..0c379947e062eee2acfa9e4245ffd771ff89a6f5 100644
--- a/CRM/Core/CodeGen/Specification.php
+++ b/CRM/Core/CodeGen/Specification.php
@@ -287,7 +287,9 @@ class CRM_Core_CodeGen_Specification {
           $this->getDynamicForeignKey($foreignXML, $dynamicForeign, $name);
         }
       }
-      $table['dynamicForeignKey'] = $dynamicForeign;
+      if (!empty($dynamicForeign)) {
+        $table['dynamicForeignKey'] = $dynamicForeign;
+      }
     }
 
     $tables[$name] = &$table;