diff --git a/README.md b/README.md
index 5b377e2247e9e59836c72397c4bee8de93e56bb9..352122955450b9aae0ca87f89d742710f6dd277f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/bgp_peer-2.2.3-20240517.mkp "bgp_peer-2.2.3-20240517.mkp"
+[PACKAGE]: ../../raw/master/mkp/bgp_peer-2.2.4-20240607.mkp "bgp_peer-2.2.4-20240607.mkp"
 # BGP Peer
 
 Check plugin to monitor the status of BGP peers and inventory plugin for static BGP peer data.
diff --git a/mkp/bgp_peer-2.2.4-20240607.mkp b/mkp/bgp_peer-2.2.4-20240607.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..f4e0ad547137e96a038d7b1fa0e83ca9133779b3
Binary files /dev/null and b/mkp/bgp_peer-2.2.4-20240607.mkp differ
diff --git a/source/agent_based/bgp_peer.py b/source/agent_based/bgp_peer.py
index 3aba7558d45ef5906354f9e6fe77dd23a78aca44..0a3bfe19ad406c4419b5c1364e59504df1d59db9 100644
--- a/source/agent_based/bgp_peer.py
+++ b/source/agent_based/bgp_peer.py
@@ -34,6 +34,7 @@
 # 2023-03-26: optimized output of metrics, GetRateError will not be set to 0 anymore
 # 2023-08-17: fix removed internal_item form check_default_parameters (THX mail[at]bastian-kuhn[dot]de)
 #             added warning if internal_item is missing in params
+# 2024-06-07: fixed crash on configured state mapping
 
 # Example Agent Output:
 # BGP4-MIB
@@ -134,7 +135,16 @@ def check_bgp_peer(item, params, section: Dict[str, BgpPeer]) -> CheckResult:
     else:
         item = params['internal_item']
 
-    neighborstate = params['neighborstate']
+    neighborstate = {
+        '1': 2,  # idle
+        '2': 1,  # connect
+        '3': 1,  # active
+        '4': 1,  # opensent
+        '5': 1,  # openconfirm
+        '6': 0,  # established
+    }
+
+    neighborstate.update(params['neighborstate'])
     peer_not_found_state = params['peernotfound']
 
     for bgp_connection, bgp_alias, not_found_state in params.get('peer_list', []):
diff --git a/source/packages/bgp_peer b/source/packages/bgp_peer
index 880d7963fae7de33413f25cdbe3520606fd5d17a..6cbdb8a1ba476ba3a4f0bcf08a06c70cf4bc0437 100644
--- a/source/packages/bgp_peer
+++ b/source/packages/bgp_peer
@@ -37,7 +37,7 @@
            'web': ['plugins/views/inv_bgp_peer.py']},
  'name': 'bgp_peer',
  'title': 'BGP Peer',
- 'version': '2.2.3-20240517',
+ 'version': '2.2.4-20240607',
  'version.min_required': '2.2.0b1',
  'version.packaged': '2.2.0p24',
  'version.usable_until': None}