diff --git a/pkg/services/control/server/policy_engine.go b/pkg/services/control/server/policy_engine.go
index e2e1fd73..98daac8a 100644
--- a/pkg/services/control/server/policy_engine.go
+++ b/pkg/services/control/server/policy_engine.go
@@ -174,10 +174,8 @@ func (s *Server) RemoveChainLocalOverride(_ context.Context, req *control.Remove
 		return nil, err
 	}
 
-	if err = s.localOverrideStorage.LocalStorage().RemoveOverride(apechain.Ingress, target, apechain.ID(req.GetBody().GetChainId())); err != nil {
-		if code := getCodeByLocalStorageErr(err); code != codes.NotFound {
-			return nil, status.Error(code, err.Error())
-		}
+	if err = s.localOverrideStorage.LocalStorage().RemoveOverride(apechain.Ingress, target, req.GetBody().GetChainId()); err != nil {
+		return nil, status.Error(getCodeByLocalStorageErr(err), err.Error())
 	}
 	resp := &control.RemoveChainLocalOverrideResponse{
 		Body: &control.RemoveChainLocalOverrideResponse_Body{},
@@ -200,9 +198,7 @@ func (s *Server) RemoveChainLocalOverridesByTarget(_ context.Context, req *contr
 	}
 
 	if err = s.localOverrideStorage.LocalStorage().RemoveOverridesByTarget(apechain.Ingress, target); err != nil {
-		if code := getCodeByLocalStorageErr(err); code != codes.NotFound {
-			return nil, status.Error(code, err.Error())
-		}
+		return nil, status.Error(getCodeByLocalStorageErr(err), err.Error())
 	}
 	resp := &control.RemoveChainLocalOverridesByTargetResponse{
 		Body: &control.RemoveChainLocalOverridesByTargetResponse_Body{},
@@ -246,7 +242,8 @@ func (s *Server) ListTargetsLocalOverrides(_ context.Context, req *control.ListT
 }
 
 func getCodeByLocalStorageErr(err error) codes.Code {
-	if errors.Is(err, engine.ErrChainNotFound) || errors.Is(err, engine.ErrChainNameNotFound) {
+	if errors.Is(err, engine.ErrChainNotFound) || errors.Is(err, engine.ErrChainNameNotFound) ||
+		errors.Is(err, engine.ErrResourceNotFound) {
 		return codes.NotFound
 	}
 	return codes.Internal