diff --git a/pkg/modules/tracefunnel/impltracefunnel/handler.go b/pkg/modules/tracefunnel/impltracefunnel/handler.go
index 39e2140a00..2bee100409 100644
--- a/pkg/modules/tracefunnel/impltracefunnel/handler.go
+++ b/pkg/modules/tracefunnel/impltracefunnel/handler.go
@@ -196,7 +196,12 @@ func (handler *handler) Get(rw http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	funnelID := vars["funnel_id"]
 
-	claims, _ := authtypes.ClaimsFromContext(r.Context()) // Ignore error as email is optional
+	claims, err := authtypes.ClaimsFromContext(r.Context())
+
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
 
 	funnel, err := handler.module.Get(r.Context(), valuer.MustNewUUID(funnelID), valuer.MustNewUUID(claims.OrgID))
 	if err != nil {
@@ -213,7 +218,12 @@ func (handler *handler) Delete(rw http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	funnelID := vars["funnel_id"]
 
-	claims, _ := authtypes.ClaimsFromContext(r.Context())
+	claims, err := authtypes.ClaimsFromContext(r.Context())
+
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
 
 	if err := handler.module.Delete(r.Context(), valuer.MustNewUUID(funnelID), valuer.MustNewUUID(claims.OrgID)); err != nil {
 		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
diff --git a/pkg/types/tracefunneltypes/utils.go b/pkg/types/tracefunneltypes/utils.go
index 2b90720d75..60ca4eaf36 100644
--- a/pkg/types/tracefunneltypes/utils.go
+++ b/pkg/types/tracefunneltypes/utils.go
@@ -2,7 +2,6 @@ package tracefunneltypes
 
 import (
 	"fmt"
-	"net/http"
 	"sort"
 	"time"
 
@@ -87,16 +86,6 @@ func NormalizeFunnelSteps(steps []*FunnelStep) []*FunnelStep {
 	return newSteps
 }
 
-func GetClaims(r *http.Request) (*authtypes.Claims, error) {
-	claims, err := authtypes.ClaimsFromContext(r.Context())
-	if err != nil {
-		return nil, errors.Newf(errors.TypeInvalidInput,
-			errors.CodeInvalidInput,
-			"unauthenticated")
-	}
-	return &claims, nil
-}
-
 func ValidateAndConvertTimestamp(timestamp int64) (time.Time, error) {
 	if err := ValidateTimestamp(timestamp, "timestamp"); err != nil {
 		return time.Time{}, errors.Newf(errors.TypeInvalidInput,
diff --git a/pkg/types/tracefunneltypes/utils_test.go b/pkg/types/tracefunneltypes/utils_test.go
index 8ebc4cd347..451a650294 100644
--- a/pkg/types/tracefunneltypes/utils_test.go
+++ b/pkg/types/tracefunneltypes/utils_test.go
@@ -408,7 +408,7 @@ func TestGetClaims(t *testing.T) {
 			req := httptest.NewRequest("GET", "/", nil)
 			tt.setup(req)
 
-			claims, err := GetClaims(req)
+			claims, err := authtypes.ClaimsFromContext(req.Context())
 			if tt.expectError {
 				assert.Error(t, err)
 				assert.Nil(t, claims)