diff --git a/agent_based/bgp_peer.py b/agent_based/bgp_peer.py
index 65530c3e99ea1f8a45b65c3182acd1aa624097f0..c54b89f804cb2da298cbe1eac4b9d2dc2f278883 100644
--- a/agent_based/bgp_peer.py
+++ b/agent_based/bgp_peer.py
@@ -31,6 +31,7 @@
 # 2023-02-16: changed for CMK 2.1 (moved gui files from local/share/.. to local/lib/..)
 #             fix type error in discovery (CMK2.1 GUI only)
 # 2023-02-20: fix crash if metric data is None
+# 2023-03-26: optimized output of metrics, GetRateError will not be set to 0 anymore
 
 # Example Agent Output:
 # BGP4-MIB
@@ -62,7 +63,7 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     get_rate,
     GetRateError,
     get_value_store,
-    IgnoreResultsError,
+    # IgnoreResultsError,
     Metric,
     render,
 )
@@ -198,16 +199,14 @@ def check_bgp_peer(item, params, section: Dict[str, BgpPeer]) -> CheckResult:
     now_time = time.time()
     value_store = get_value_store()
 
-    for entry in peer.metric_rate:
-        key, value = entry
+    for key, value in peer.metric_rate:
         try:
             value = get_rate(value_store, f'{key}', now_time, value, raise_overflow=True)
         except GetRateError:
-            value = 0
+            continue
         yield Metric(name=f'bgp_peer_{key}', value=value, boundaries=(0, None))
 
-    for entry in peer.metric_count:
-        key, value = entry
+    for key, value in peer.metric_count:
         if value is not None:
             yield Metric(name=f'bgp_peer_{key}', value=value, boundaries=(0, None))
 
diff --git a/bgp_peer-2.0.1-20230607.mkp b/bgp_peer-2.0.1-20230607.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..668d8ce90700a617c00f8a6c4bf22628224a2c19
Binary files /dev/null and b/bgp_peer-2.0.1-20230607.mkp differ
diff --git a/bgp_peer.mkp b/bgp_peer.mkp
index bdf946b84f571cbe0512fd684bc22f6330222eff..668d8ce90700a617c00f8a6c4bf22628224a2c19 100644
Binary files a/bgp_peer.mkp and b/bgp_peer.mkp differ
diff --git a/packages/bgp_peer b/packages/bgp_peer
index 5420e204271ae7102debaa11b42a174ce04ccb4c..6c4c90c20413e61d46bd8e500b2f613899a24cc0 100644
--- a/packages/bgp_peer
+++ b/packages/bgp_peer
@@ -19,7 +19,7 @@
                    'wato/inv_bgp_peer.py']},
  'name': 'bgp_peer',
  'title': 'BGP Peer',
- 'version': '20230220.v2.0.1',
- 'version.min_required': '2.1.0',
+ 'version': '2.0.1-20230607',
+ 'version.min_required': '2.1.0b1',
  'version.packaged': '2.1.0p21',
  'version.usable_until': None}
\ No newline at end of file