diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index e4fd78b85e3..22ade9c554f 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -172,7 +172,7 @@ var dimensionsMap = map[string][]string{
 	"AWS/ElasticMapReduce":  {"ClusterId", "JobFlowId", "JobId"},
 	"AWS/ElasticTranscoder": {"Operation", "PipelineId"},
 	"AWS/Events":            {"RuleName"},
-	"AWS/FSx":               {},
+	"AWS/FSx":               {"FileSystemId"},
 	"AWS/Firehose":          {"DeliveryStreamName"},
 	"AWS/GameLift":          {"FleetId", "InstanceType", "MatchmakingConfigurationName", "MatchmakingConfigurationName-RuleName", "MetricGroups", "OperatingSystem", "QueueName"},
 	"AWS/Glue":              {"JobName", "JobRunId", "Type"},