diff --git a/server/workflow_server.go b/server/workflow_server.go
index 66d8a47..eaf3c6d 100644
--- a/server/workflow_server.go
+++ b/server/workflow_server.go
@@ -2,6 +2,8 @@ package server
 
 import (
 	"context"
+	"github.com/onepanelio/core/pkg/util"
+	"google.golang.org/grpc/codes"
 	"math"
 	"sort"
 	"strings"
@@ -189,6 +191,9 @@ func (s *WorkflowServer) GetWorkflowExecutionMetrics(ctx context.Context, req *a
 			Format: m.Format,
 		})
 	}
+	if len(apiMetrics) == 0 {
+		return nil, util.NewUserError(codes.NotFound, "Metrics were not found.")
+	}
 
 	return &api.GetWorkflowExecutionMetricsResponse{Metrics: apiMetrics}, nil
 }