diff --git a/server/service/queries.go b/server/service/queries.go
index 43f7384de8..a911790e90 100644
--- a/server/service/queries.go
+++ b/server/service/queries.go
@@ -97,7 +97,7 @@ func (svc *Service) ListQueries(ctx context.Context, opt fleet.ListOptions, team
 	}
 
 	user := authz.UserFromContext(ctx)
-	onlyShowObserverCanRun := onlyShowObserverCanRunQueries(user)
+	onlyShowObserverCanRun := onlyShowObserverCanRunQueries(user, teamID)
 
 	queries, err := svc.ds.ListQueries(ctx, fleet.ListQueryOptions{
 		ListOptions:        opt,
@@ -112,20 +112,14 @@ func (svc *Service) ListQueries(ctx context.Context, opt fleet.ListOptions, team
 	return queries, nil
 }
 
-func onlyShowObserverCanRunQueries(user *fleet.User) bool {
+func onlyShowObserverCanRunQueries(user *fleet.User, teamID *uint) bool {
 	if user.GlobalRole != nil && *user.GlobalRole == fleet.RoleObserver {
 		return true
-	} else if len(user.Teams) > 0 {
-		allObserver := true
-		for _, team := range user.Teams {
-			if team.Role != fleet.RoleObserver {
-				allObserver = false
-				break
-			}
-		}
-		return allObserver
 	}
-	return false
+
+	return teamID != nil && user.TeamMembership(func(ut fleet.UserTeam) bool {
+		return ut.Role == fleet.RoleObserver
+	})[*teamID]
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/server/service/queries_test.go b/server/service/queries_test.go
index 90ee225722..7477e5fa4c 100644
--- a/server/service/queries_test.go
+++ b/server/service/queries_test.go
@@ -13,19 +13,63 @@ import (
 )
 
 func TestFilterQueriesForObserver(t *testing.T) {
-	require.True(t, onlyShowObserverCanRunQueries(&fleet.User{GlobalRole: ptr.String(fleet.RoleObserver)}))
-	require.False(t, onlyShowObserverCanRunQueries(&fleet.User{GlobalRole: ptr.String(fleet.RoleMaintainer)}))
-	require.False(t, onlyShowObserverCanRunQueries(&fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}))
+	t.Run("global role", func(t *testing.T) {
+		require.True(t, onlyShowObserverCanRunQueries(&fleet.User{
+			GlobalRole: ptr.String(fleet.RoleObserver),
+		}, nil))
 
-	require.True(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{{Role: fleet.RoleObserver}}}))
-	require.True(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{
-		{Role: fleet.RoleObserver},
-		{Role: fleet.RoleObserver},
-	}}))
-	require.False(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{
-		{Role: fleet.RoleObserver},
-		{Role: fleet.RoleMaintainer},
-	}}))
+		require.False(t, onlyShowObserverCanRunQueries(&fleet.User{
+			GlobalRole: ptr.String(fleet.RoleObserverPlus),
+		}, nil))
+
+		require.False(t, onlyShowObserverCanRunQueries(&fleet.User{
+			GlobalRole: ptr.String(fleet.RoleMaintainer),
+		}, nil))
+
+		require.False(t, onlyShowObserverCanRunQueries(&fleet.User{
+			GlobalRole: ptr.String(fleet.RoleAdmin),
+		}, nil))
+	})
+
+	t.Run("user belongs to one or more teams", func(t *testing.T) {
+		require.True(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{{
+			Role: fleet.RoleObserver,
+			Team: fleet.Team{ID: 1},
+		}}}, ptr.Uint(1)))
+
+		require.True(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{
+			{
+				Role: fleet.RoleObserver,
+				Team: fleet.Team{ID: 1},
+			},
+			{
+				Role: fleet.RoleObserver,
+				Team: fleet.Team{ID: 2},
+			},
+		}}, ptr.Uint(2)))
+
+		require.True(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{
+			{
+				Role: fleet.RoleObserver,
+				Team: fleet.Team{ID: 1},
+			},
+			{
+				Role: fleet.RoleMaintainer,
+				Team: fleet.Team{ID: 2},
+			},
+		}}, ptr.Uint(1)))
+
+		require.False(t, onlyShowObserverCanRunQueries(&fleet.User{Teams: []fleet.UserTeam{
+			{
+				Role: fleet.RoleObserver,
+				Team: fleet.Team{ID: 1},
+			},
+			{
+				Role: fleet.RoleMaintainer,
+				Team: fleet.Team{ID: 2},
+			},
+		}}, ptr.Uint(2)))
+	})
 }
 
 func TestListQueries(t *testing.T) {