diff --git a/backend/.sqlx/query-303c7e92ce23dc367d97d813415cd9aef958c15df1c0a7b02318a756cd3589e9.json b/backend/.sqlx/query-303c7e92ce23dc367d97d813415cd9aef958c15df1c0a7b02318a756cd3589e9.json
new file mode 100644
index 0000000000..58cfc98b09
--- /dev/null
+++ b/backend/.sqlx/query-303c7e92ce23dc367d97d813415cd9aef958c15df1c0a7b02318a756cd3589e9.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH job_result AS (\n                SELECT result \n                FROM v2_job_completed \n                WHERE id = $1\n            )\n            UPDATE v2_job \n            SET args = COALESCE(\n                    CASE \n                        WHEN job_result.result IS NULL THEN NULL\n                        WHEN jsonb_typeof(job_result.result) = 'object' \n                        THEN job_result.result\n                        WHEN jsonb_typeof(job_result.result) = 'null'\n                        THEN NULL\n                        ELSE jsonb_build_object('value', job_result.result)\n                    END, \n                    '{}'::jsonb\n                ),\n                preprocessed = TRUE\n            FROM job_result\n            WHERE v2_job.id = $2;\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "303c7e92ce23dc367d97d813415cd9aef958c15df1c0a7b02318a756cd3589e9"
+}
diff --git a/backend/.sqlx/query-8a1c9119f6f4763f64597684dc7b312404e637212de1897e97999755a2e492fd.json b/backend/.sqlx/query-8a1c9119f6f4763f64597684dc7b312404e637212de1897e97999755a2e492fd.json
deleted file mode 100644
index 8a92be2af8..0000000000
--- a/backend/.sqlx/query-8a1c9119f6f4763f64597684dc7b312404e637212de1897e97999755a2e492fd.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job SET\n                    args = (SELECT result FROM v2_job_completed WHERE id = $1),\n                    preprocessed = TRUE\n                WHERE id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "8a1c9119f6f4763f64597684dc7b312404e637212de1897e97999755a2e492fd"
-}
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 90caf92518..3248c2fe20 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -717,7 +717,12 @@ macro_rules! get_job_query {
         const_format::formatcp!(
             "SELECT \
             id, {table}.workspace_id, parent_job, created_by, {table}.created_at, started_at, script_hash, script_path, \
-            CASE WHEN args is null or pg_column_size(args) < 90000 THEN args ELSE '{{\"reason\": \"WINDMILL_TOO_BIG\"}}'::jsonb END as args, \
+            CASE WHEN args is null THEN NULL
+            WHEN pg_column_size(args) < 90000 THEN 
+                CASE WHEN jsonb_typeof(args) = 'object' THEN args
+                ELSE jsonb_build_object('value', args)
+                END
+            ELSE '{{\"reason\": \"WINDMILL_TOO_BIG\"}}'::jsonb END as args, \
             {logs} as logs, {code} as raw_code, canceled, canceled_by, canceled_reason, job_kind, \
             schedule_path, permissioned_as, flow_status, {flow} as raw_flow, is_flow_step, language, \
             {lock} as raw_lock, email, visible_to_owner, mem_peak, tag, priority, preprocessed, {additional_fields} \
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 90b0444901..f523ce0723 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -2147,7 +2147,7 @@ async fn handle_queued_job(
         #[cfg(not(feature = "enterprise"))]
         if job.concurrent_limit.is_some() {
             logs.push_str("---\n");
-            logs.push_str("WARNING: This job has concurrency limits enabled. Concurrency limits are going to become an Enterprise Edition feature in the near future.\n");
+            logs.push_str("WARNING: This job has concurrency limits enabled. Concurrency limits are an EE feature and the setting is ignored.\n");
             logs.push_str("---\n");
         }
 
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 5e4224681f..f265adaf93 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -408,10 +408,27 @@ pub async fn update_flow_status_after_job_completion_internal(
 
         if matches!(module_step, Step::PreprocessorStep) {
             sqlx::query!(
-                "UPDATE v2_job SET
-                    args = (SELECT result FROM v2_job_completed WHERE id = $1),
-                    preprocessed = TRUE
-                WHERE id = $2",
+                "WITH job_result AS (
+                SELECT result 
+                FROM v2_job_completed 
+                WHERE id = $1
+            )
+            UPDATE v2_job 
+            SET args = COALESCE(
+                    CASE 
+                        WHEN job_result.result IS NULL THEN NULL
+                        WHEN jsonb_typeof(job_result.result) = 'object' 
+                        THEN job_result.result
+                        WHEN jsonb_typeof(job_result.result) = 'null'
+                        THEN NULL
+                        ELSE jsonb_build_object('value', job_result.result)
+                    END, 
+                    '{}'::jsonb
+                ),
+                preprocessed = TRUE
+            FROM job_result
+            WHERE v2_job.id = $2;
+            ",
                 job_id_for_status,
                 flow
             )