diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
index e1546dd0b1..ab5580cd88 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
@@ -61,6 +61,10 @@
       fromRelationship.relationshipType === RelationshipTypes.MANY_TO_MANY
     // main is simply used to know this is the side the user configured it from
     const id = uuid()
+    if (!manyToMany) {
+      delete fromRelationship.through
+      delete toRelationship.through
+    }
     let relateFrom = {
       ...fromRelationship,
       type: "link",
@@ -154,21 +158,21 @@
     bind:value={toRelationship.tableId}
   />
   <Select
-      label={"Select to table"}
-      options={tableOptions}
-      bind:value={fromRelationship.tableId}
+    label={"Select to table"}
+    options={tableOptions}
+    bind:value={fromRelationship.tableId}
   />
   {#if fromRelationship?.relationshipType === RelationshipTypes.MANY_TO_MANY}
     <Select
-        label={"Through"}
-        options={tableOptions}
-        bind:value={fromRelationship.through}
+      label={"Through"}
+      options={tableOptions}
+      bind:value={fromRelationship.through}
     />
   {:else if toTable}
     <Select
-        label={`Foreign Key (${toTable?.name})`}
-        options={Object.keys(toTable?.schema)}
-        bind:value={fromRelationship.fieldName}
+      label={`Foreign Key (${toTable?.name})`}
+      options={Object.keys(toTable?.schema)}
+      bind:value={fromRelationship.fieldName}
     />
   {/if}
   <div class="headings">
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index 85f300119c..790a97c4d2 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -198,18 +198,19 @@
             </div>
           {/each}
         </div>
-
-        <Divider />
-        <div class="query-header">
-          <Heading size="S">Relationships</Heading>
-          <Button primary on:click={() => openRelationshipModal()}
-            >Create Relationship</Button
-          >
-        </div>
-        <Body>
+        {#if plusTables?.length !== 0}
+          <Divider />
+          <div class="query-header">
+            <Heading size="S">Relationships</Heading>
+            <Button primary on:click={() => openRelationshipModal()}
+              >Create Relationship</Button
+            >
+          </div>
+          <Body>
           Tell budibase how your tables are related to get even more smart
           features.
-        </Body>
+          </Body>
+        {/if}
         <div class="query-list">
           {#each Object.values(relationships) as relationship}
             <div
