diff --git a/frontend/src/app/pages/MainPage/pages/ViewPage/Main/StructView/components/SelectDataSource.tsx b/frontend/src/app/pages/MainPage/pages/ViewPage/Main/StructView/components/SelectDataSource.tsx
index c3646711b..029cd8d35 100644
--- a/frontend/src/app/pages/MainPage/pages/ViewPage/Main/StructView/components/SelectDataSource.tsx
+++ b/frontend/src/app/pages/MainPage/pages/ViewPage/Main/StructView/components/SelectDataSource.tsx
@@ -268,11 +268,15 @@ const SelectDataSource = memo(
         });
       }
 
-      if (type === 'JOINS' && joinTable?.table) {
-        setSelectedTableSchema({
-          table: joinTable['table'],
-          columns: joinTable['columns'],
-        });
+      if (type === 'JOINS') {
+        if (joinTable?.table) {
+          setSelectedTableSchema({
+            table: joinTable.table,
+            columns: joinTable.columns,
+          });
+        } else {
+          setSelectedTableSchema(null);
+        }
       }
     }, [structure, type, joinTable, sources, sourceId]);