diff --git a/workitem/expression_compiler.go b/workitem/expression_compiler.go
index 824f1f9367..966758cf84 100644
--- a/workitem/expression_compiler.go
+++ b/workitem/expression_compiler.go
@@ -125,21 +125,21 @@ var DefaultTableJoins = func() TableJoinMap {
 		"iteration": {
 			TableName:        "iterations",
 			TableAlias:       "iter",
-			On:               JoinOnJSONField(SystemIteration, "iter.id"),
+			On:               JoinOnJSONField(SystemIteration, "iter.id") + " AND " + Column("iter", "space_id") + "=" + Column(WorkItemStorage{}.TableName(), "space_id"),
 			PrefixActivators: []string{"iteration."},
 			AllowedColumns:   []string{"name", "created_at"},
 		},
 		"area": {
 			TableName:        "areas",
 			TableAlias:       "ar",
-			On:               JoinOnJSONField(SystemArea, "ar.id"),
+			On:               JoinOnJSONField(SystemArea, "ar.id") + " AND " + Column("ar", "space_id") + "=" + Column(WorkItemStorage{}.TableName(), "space_id"),
 			PrefixActivators: []string{"area."},
 			AllowedColumns:   []string{"name"},
 		},
 		"codebase": {
 			TableName:        "codebases",
 			TableAlias:       "cb",
-			On:               JoinOnJSONField(SystemCodebase, "cb.id"),
+			On:               JoinOnJSONField(SystemCodebase, "cb.id") + " AND " + Column("cb", "space_id") + "=" + Column(WorkItemStorage{}.TableName(), "space_id"),
 			PrefixActivators: []string{"codebase."},
 			AllowedColumns:   []string{"url"},
 		},