diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 360b479ea3..27810008d3 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -35,9 +35,8 @@ export async function patch(ctx: any): Promise<any> {
       pickApi(tableId).patch(ctx)
     )
     ctx.status = 200
-    if (!ctx.disableEmit && ctx.eventEmitter) {
+    ctx.eventEmitter &&
       ctx.eventEmitter.emitRow(`row:update`, appId, row, table)
-    }
     ctx.message = `${table.name} updated successfully.`
     ctx.body = row
   } catch (err) {
diff --git a/packages/server/src/automations/steps/updateRow.js b/packages/server/src/automations/steps/updateRow.js
index c287d897e9..f66fcf9432 100644
--- a/packages/server/src/automations/steps/updateRow.js
+++ b/packages/server/src/automations/steps/updateRow.js
@@ -1,7 +1,6 @@
 const rowController = require("../../api/controllers/row")
 const automationUtils = require("../automationUtils")
 const { buildCtx } = require("./utils")
-const env = require("../../environment")
 
 exports.definition = {
   name: "Update Row",
@@ -84,7 +83,6 @@ exports.run = async function ({ inputs, appId, emitter }) {
       rowId: inputs.rowId,
       tableId: tableId,
     },
-    disableEmit: !env.SELF_HOSTED,
   })
 
   try {
diff --git a/packages/server/src/events/AutomationEmitter.js b/packages/server/src/events/AutomationEmitter.js
index fbfc445e2c..99345228ff 100644
--- a/packages/server/src/events/AutomationEmitter.js
+++ b/packages/server/src/events/AutomationEmitter.js
@@ -1,8 +1,10 @@
 const { rowEmission, tableEmission } = require("./utils")
 const mainEmitter = require("./index")
+const env = require("../environment")
 
 // max number of automations that can chain on top of each other
-const MAX_AUTOMATION_CHAIN = 5
+// TODO: in future make this configurable at the automation level
+const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0
 
 /**
  * Special emitter which takes the count of automation runs which have occurred and blocks an