diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index bd993b5af0..c3cd7eae8e 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -94,7 +94,8 @@ export const getBackendUiStore = () => {
       saveField: ({ originalName, field, primaryDisplay = false }) => {
         store.update(state => {
           // delete the original if renaming
-          if (originalName) {
+          // need to handle if the column had no name, empty string
+          if (originalName || originalName === "") {
             delete state.draftTable.schema[originalName]
             state.draftTable._rename = {
               old: originalName,
diff --git a/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
index e4db32d900..071d8038bf 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
@@ -43,7 +43,11 @@
 
   function sort(direction, column) {
     backendUiStore.update(state => {
-      state.sort = { direction, column }
+      if (direction !== "none") {
+        state.sort = {direction, column}
+      } else {
+        state.sort = undefined
+      }
       return state
     })
     hideEditor()
@@ -70,6 +74,12 @@
         <Icon name="delete" />
         Delete
       </li>
+      {#if sortDirection === 'desc' || sortDirection === 'asc'}
+        <li on:click={() => sort('none', field.name)}>
+          <Icon name="close" />
+          Remove sort
+        </li>
+      {/if}
       {#if sortDirection === 'desc' || sortColumn !== field.name}
         <li on:click={() => sort('asc', field.name)}>
           <Icon name="sortascending" />
diff --git a/packages/server/src/api/controllers/table.js b/packages/server/src/api/controllers/table.js
index 9ce6493eba..5966bbdc5d 100644
--- a/packages/server/src/api/controllers/table.js
+++ b/packages/server/src/api/controllers/table.js
@@ -36,7 +36,10 @@ exports.save = async function(ctx) {
   let renameDocs = []
 
   // if the table obj had an _id then it will have been retrieved
-  const oldTable = ctx.preExisting
+  let oldTable
+  if (ctx.request.body && ctx.request.body._id) {
+    oldTable = await db.get(ctx.request.body._id)
+  }
 
   // Don't rename if the name is the same
   let { _rename } = tableToSave