diff --git a/backend/migrations/20240711065915_remove_env_id_default.down.sql b/backend/migrations/20240711065915_remove_env_id_default.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20240711065915_remove_env_id_default.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20240711065915_remove_env_id_default.up.sql b/backend/migrations/20240711065915_remove_env_id_default.up.sql
new file mode 100644
index 0000000000..4b2bfe800a
--- /dev/null
+++ b/backend/migrations/20240711065915_remove_env_id_default.up.sql
@@ -0,0 +1,5 @@
+-- Add up migration script here
+ALTER TABLE queue ALTER COLUMN env_id DROP NOT NULL;
+ALTER TABLE queue ALTER COLUMN env_id DROP DEFAULT;
+ALTER TABLE completed_job ALTER COLUMN env_id DROP NOT NULL;
+ALTER TABLE completed_job ALTER COLUMN env_id DROP DEFAULT;
\ No newline at end of file
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index f89014ad27..c042dd1da7 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -701,7 +701,7 @@ fn generate_get_job_query(no_logs: bool, table: &str) -> String {
     return format!("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, 
-    {log_expr} as logs, raw_code, canceled, canceled_by, canceled_reason, job_kind, env_id,
+    {log_expr} as logs, raw_code, canceled, canceled_by, canceled_reason, job_kind,
     schedule_path, permissioned_as, flow_status, raw_flow, is_flow_step, language,
     raw_lock, email, visible_to_owner, mem_peak, tag, priority, {additional_fields}
     FROM {table}
@@ -4604,7 +4604,7 @@ async fn get_completed_job<'a>(
     Path((w_id, id)): Path<(String, Uuid)>,
 ) -> error::Result<Response> {
     let job_o = sqlx::query_as::<_, CompletedJob>("SELECT id, workspace_id, parent_job, created_by, created_at, duration_ms, success, script_hash, script_path, 
-    CASE WHEN args is null or pg_column_size(args) < 90000 THEN args ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as args, CASE WHEN result is null or pg_column_size(result) < 90000 THEN result ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as result, logs, deleted, raw_code, canceled, canceled_by, canceled_reason, job_kind, env_id,
+    CASE WHEN args is null or pg_column_size(args) < 90000 THEN args ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as args, CASE WHEN result is null or pg_column_size(result) < 90000 THEN result ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as result, logs, deleted, raw_code, canceled, canceled_by, canceled_reason, job_kind,
     schedule_path, permissioned_as, flow_status, raw_flow, is_flow_step, language, started_at, is_skipped,
     raw_lock, email, visible_to_owner, mem_peak, tag, priority, result->'wm_labels' as labels FROM completed_job WHERE id = $1 AND workspace_id = $2")
         .bind(id)
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 93bbd4ab6c..24c65642b0 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -1954,7 +1954,7 @@ async fn pull_single_job_and_mark_as_running_no_concurrency_limit<
             WHERE id = $1
             RETURNING  id,  workspace_id,  parent_job,  created_by,  created_at,  started_at,  scheduled_for,
                 running,  script_hash,  script_path,  args,   right(logs, 900000) as logs,  raw_code,  canceled,  canceled_by,  
-                canceled_reason,  last_ping,  job_kind,  env_id,  schedule_path,  permissioned_as, 
+                canceled_reason,  last_ping,  job_kind,  schedule_path,  permissioned_as, 
                 flow_status,  raw_flow,  is_flow_step,  language,  suspend,  suspend_until,  
                 same_worker,  raw_lock,  pre_run_error,  email,  visible_to_owner,  mem_peak, 
                  root_job,  leaf_jobs,  tag,  concurrent_limit,  concurrency_time_window_s,  
@@ -2006,7 +2006,7 @@ async fn pull_single_job_and_mark_as_running_no_concurrency_limit<
             )
             RETURNING  id,  workspace_id,  parent_job,  created_by,  created_at,  started_at,  scheduled_for,
             running,  script_hash,  script_path,  args,   null as logs,  raw_code,  canceled,  canceled_by,  
-            canceled_reason,  last_ping,  job_kind,  env_id,  schedule_path,  permissioned_as, 
+            canceled_reason,  last_ping,  job_kind, schedule_path,  permissioned_as, 
             flow_status,  raw_flow,  is_flow_step,  language,  suspend,  suspend_until,  
             same_worker,  raw_lock,  pre_run_error,  email,  visible_to_owner,  mem_peak, 
              root_job,  leaf_jobs,  tag,  concurrent_limit,  concurrency_time_window_s,  
@@ -2039,7 +2039,7 @@ async fn pull_single_job_and_mark_as_running_no_concurrency_limit<
                     )
                     RETURNING  id,  workspace_id,  parent_job,  created_by,  created_at,  started_at,  scheduled_for,
                     running,  script_hash,  script_path,  args,  null as logs,  raw_code,  canceled,  canceled_by,  
-                    canceled_reason,  last_ping,  job_kind,  env_id,  schedule_path,  permissioned_as, 
+                    canceled_reason,  last_ping,  job_kind,  schedule_path,  permissioned_as, 
                     flow_status,  raw_flow,  is_flow_step,  language,  suspend,  suspend_until,  
                     same_worker,  raw_lock,  pre_run_error,  email,  visible_to_owner,  mem_peak, 
                      root_job,  leaf_jobs,  tag,  concurrent_limit,  concurrency_time_window_s,