diff --git a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
index 9fdc775b264b42204f6048f4294d8ba038488585..fc7f970027850bc3eaf3e21343bfcf22ff1fa7ad 100644
--- a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
+++ b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
@@ -551,7 +551,7 @@ export default {
       if (config.isMultiple) {
         setting.multiple = config.isMultiple;
       }
-      if (config.dataSource === 'matrix') {
+      if (config.dataSource === 'matrix' && config.matrixUuid) {
         setting.dynamicUrl = '/api/rest/matrix/column/data/search/forselect';
         setting.rootName = 'dataList';
         const params = { matrixUuid: config.matrixUuid };
@@ -562,7 +562,7 @@ export default {
         }
         setting.params = params;
       } else {
-        setting.dataList = config.dataList;
+        setting.dataList = config.dataList || [];
       }
       return setting;
     },