diff --git a/api/adapter/controller.go b/api/adapter/controller.go
index 5e731b0f8..0c59043c9 100644
--- a/api/adapter/controller.go
+++ b/api/adapter/controller.go
@@ -117,10 +117,6 @@ func get(c *fiber.Ctx) error {
 		panic(err)
 	}
 
-	if results == nil {
-		results = []AdapterModel{}
-	}
-
 	return c.JSON(results)
 }
 
diff --git a/api/aggregator/controller.go b/api/aggregator/controller.go
index 8a4040f5f..b68863fe5 100644
--- a/api/aggregator/controller.go
+++ b/api/aggregator/controller.go
@@ -231,10 +231,6 @@ func get(c *fiber.Ctx) error {
 		panic(err)
 	}
 
-	if results == nil {
-		results = []AggregatorResultModel{}
-	}
-
 	return c.JSON(results)
 }
 
diff --git a/api/utils/utils.go b/api/utils/utils.go
index b02b949cd..1b815f9e2 100644
--- a/api/utils/utils.go
+++ b/api/utils/utils.go
@@ -123,8 +123,8 @@ func QueryRows[T any](c *fiber.Ctx, query string, args map[string]any) ([]T, err
 	}
 
 	results, err = pgx.CollectRows(rows, pgx.RowToStructByName[T])
-	if errors.Is(err, pgx.ErrNoRows) {
-		return results, nil
+	if errors.Is(err, pgx.ErrNoRows) || (results == nil && err == nil) {
+		return []T{}, nil
 	}
 	return results, err
 }