diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
index f719ca399..f540b11c9 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/entity/entity-graphql-query-handler.service.ts
@@ -8,7 +8,7 @@ import {
 } from '@hypertrace/graphql-client';
 import { Observable } from 'rxjs';
 import { map, throwIfEmpty } from 'rxjs/operators';
-import { Entity, EntityType, ObservabilityEntityType } from '../../../../../model/schema/entity';
+import { Entity, EntityType } from '../../../../../model/schema/entity';
 import { GraphQlEntityFilter } from '../../../../../model/schema/filter/entity/graphql-entity-filter';
 import { EntitiesGraphqlQueryBuilderService } from '../entities-graphql-query-builder.service';
 import {
@@ -57,8 +57,8 @@ export class EntityGraphQlQueryHandlerService implements GraphQlQueryHandler<Gra
       timeRange: request.timeRange,
       properties: request.properties,
       filters: [new GraphQlEntityFilter(request.id, request.entityType)],
-      // If querying for a single API, then always want to includeInactive
-      includeInactive: request.entityType === ObservabilityEntityType.Api
+      // If querying for a single API by ID, then usually want to includeInactive
+      includeInactive: request.includeInactive !== false
     };
   }
 }
@@ -71,4 +71,5 @@ export interface GraphQlEntityRequest {
   id: string;
   properties: Specification[];
   timeRange: GraphQlTimeRange;
+  includeInactive?: boolean;
 }
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
index 1ad11d686..dc0a46d20 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.ts
@@ -68,7 +68,8 @@ export class InteractionsGraphQlQueryHandlerService
       id: request.entityId,
       entityType: request.entityType,
       properties: [],
-      timeRange: request.timeRange
+      timeRange: request.timeRange,
+      includeInactive: false
     };
   }