diff --git a/src/components/widget/Lookup/Lookup.js b/src/components/widget/Lookup/Lookup.js
index e87c83567..0c72df4e1 100644
--- a/src/components/widget/Lookup/Lookup.js
+++ b/src/components/widget/Lookup/Lookup.js
@@ -239,8 +239,7 @@ class Lookup extends Component {
               "field",
               item.field
             )[0];
-
-            if (itemByProperty.widgetType === "Lookup") {
+            if (item.source === "lookup" || item.widgetType === "Lookup") {
               return (
                 <RawLookup
                   key={index}
@@ -285,7 +284,7 @@ class Lookup extends Component {
                   }}
                 />
               );
-            } else if (itemByProperty.widgetType === "List") {
+            } else if (item.source === "list") {
               const isFirstProperty = index === 0;
               const isCurrentProperty =
                 item.field === property && !autofocusDisabled;