diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index af7c698014..35bacb786a 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -104,8 +104,6 @@ export const createActions = context => {
     instanceLoaded.set(false)
     loading.set(true)
 
-    console.log($datasource)
-
     // Abandon if we don't have a valid datasource
     if (!$datasource?.tableId) {
       return
@@ -270,7 +268,6 @@ export const createActions = context => {
       } else {
         return
       }
-      console.log(newRow)
       newRow = await API.saveRow(newRow, SuppressErrors)
 
       // Update state
diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts
index f95137ee08..7b29c357d3 100644
--- a/packages/server/src/websockets/grid.ts
+++ b/packages/server/src/websockets/grid.ts
@@ -21,8 +21,13 @@ export default class GridSocket extends BaseSocket {
   async onConnect(socket: Socket) {
     // Initial identification of connected spreadsheet
     socket.on(
-      GridSocketEvent.SelectTable,
-      async ({ tableId, appId }, callback) => {
+      GridSocketEvent.SelectDatasource,
+      async ({ datasource, appId }, callback) => {
+        if (datasource?.type !== "table") {
+          return
+        }
+        const tableId = datasource.tableId
+
         // Ignore if no table or app specified
         if (!tableId || !appId) {
           socket.disconnect(true)
diff --git a/packages/shared-core/src/constants.ts b/packages/shared-core/src/constants.ts
index 864009fbf2..2cb936d9a0 100644
--- a/packages/shared-core/src/constants.ts
+++ b/packages/shared-core/src/constants.ts
@@ -77,7 +77,7 @@ export enum SocketEvent {
 export enum GridSocketEvent {
   RowChange = "RowChange",
   TableChange = "TableChange",
-  SelectTable = "SelectTable",
+  SelectDatasource = "SelectDatasource",
   SelectCell = "SelectCell",
 }