diff --git a/CRM/Civirules/Utils/PreData.php b/CRM/Civirules/Utils/PreData.php
index 9d08db4bd58333d7d3b9d33a923ecb4147bc3334..785626170746e25a1503fe940bb853197a44ea30 100644
--- a/CRM/Civirules/Utils/PreData.php
+++ b/CRM/Civirules/Utils/PreData.php
@@ -127,10 +127,16 @@ class CRM_Civirules_Utils_PreData {
    * @static
    */
   public static function getPreData($entity, $entityId, $eventID) {
-    if (isset(self::$preData[$entity][$entityId][$eventID])) {
-      return self::$preData[$entity][$entityId][$eventID];
+    $entityNames = [$entity];
+    if ($entity === 'Contact') {
+      $entityNames = ['Contact', 'Individual', 'Organization', 'Household'];
     }
-    return array();
+    foreach ($entityNames as $entity) {
+      if (isset(self::$preData[$entity][$entityId][$eventID])) {
+        return self::$preData[$entity][$entityId][$eventID];
+      }
+    }
+    return [];
   }
 
 }