diff --git a/src/renderer/components/WorkspacePropsForeignModal.vue b/src/renderer/components/WorkspacePropsForeignModal.vue
index 712b51d6..762d3387 100644
--- a/src/renderer/components/WorkspacePropsForeignModal.vue
+++ b/src/renderer/components/WorkspacePropsForeignModal.vue
@@ -267,6 +267,12 @@ export default {
          addNotification: 'notifications/addNotification'
       }),
       confirmForeignsChange () {
+         this.foreignProxy = this.foreignProxy.filter(foreign =>
+            foreign.field &&
+            foreign.refField &&
+            foreign.table &&
+            foreign.refTable
+         );
          this.$emit('foreigns-update', this.foreignProxy);
       },
       selectForeign (event, id) {
@@ -331,6 +337,8 @@ export default {
          this.selectedForeignID = this.foreignProxy.length ? this.foreignProxy[0]._id : '';
       },
       async getRefFields () {
+         if (!this.selectedForeignObj.refTable) return;
+
          const params = {
             uid: this.connection.uid,
             schema: this.selectedForeignObj.refSchema,
diff --git a/src/renderer/components/WorkspacePropsIndexesModal.vue b/src/renderer/components/WorkspacePropsIndexesModal.vue
index 2d12ee8b..ee14b01e 100644
--- a/src/renderer/components/WorkspacePropsIndexesModal.vue
+++ b/src/renderer/components/WorkspacePropsIndexesModal.vue
@@ -186,6 +186,7 @@ export default {
    },
    methods: {
       confirmIndexesChange () {
+         this.indexesProxy = this.indexesProxy.filter(index => index.fields.length);
          this.$emit('indexes-update', this.indexesProxy);
       },
       selectIndex (event, id) {