diff --git a/server/server.go b/server/server.go
index d46fc868..d360e696 100644
--- a/server/server.go
+++ b/server/server.go
@@ -878,6 +878,11 @@ func (s *MCPServer) handleListResources(
 			err:  err,
 		}
 	}
+
+	if resourcesToReturn == nil {
+		resourcesToReturn = []mcp.Resource{}
+	}
+
 	result := mcp.ListResourcesResult{
 		Resources: resourcesToReturn,
 		PaginatedResult: mcp.PaginatedResult{