diff --git a/pkg/query-service/app/cloudintegrations/controller.go b/pkg/query-service/app/cloudintegrations/controller.go
index 54a0cd2e0e..20fd7499ec 100644
--- a/pkg/query-service/app/cloudintegrations/controller.go
+++ b/pkg/query-service/app/cloudintegrations/controller.go
@@ -514,7 +514,7 @@ func (c *Controller) AvailableDashboardsForCloudProvider(
 			}
 
 			for svcId, config := range configsBySvcId {
-				if config.Metrics.Enabled {
+				if config.Metrics != nil && config.Metrics.Enabled {
 					servicesWithAvailableMetrics[svcId] = &ar.CreatedAt
 				}
 			}
diff --git a/pkg/query-service/app/integrations/builtin.go b/pkg/query-service/app/integrations/builtin.go
index e264567ca3..5314412c9f 100644
--- a/pkg/query-service/app/integrations/builtin.go
+++ b/pkg/query-service/app/integrations/builtin.go
@@ -236,7 +236,7 @@ func readFileIfUri(fs embed.FS, maybeFileUri string, basedir string) (interface{
 		dataUri := fmt.Sprintf("data:image/jpeg;base64,%s", base64Contents)
 		return dataUri, nil
 
-	} else if strings.HasSuffix(maybeFileUri, ".png") || strings.HasSuffix(maybeFileUri, ".jpg") {
+	} else if strings.HasSuffix(maybeFileUri, ".png") {
 		base64Contents := base64.StdEncoding.EncodeToString(fileContents)
 		dataUri := fmt.Sprintf("data:image/png;base64,%s", base64Contents)
 		return dataUri, nil