diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99e75aa8..92427a613 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ Alle bedeutenden Änderungen an diesem Projekt werden in dieser Datei dokumentie
 
 ---
 
+## [1.1.94] – 2025-05-19
+
+### Changed
+
+- `useCreateAndSetDevices.js` vollständig von Recoil auf Redux umgestellt:
+  - `useRecoilState(polylineEventsDisabledState)` entfernt
+  - Stattdessen Zugriff über `useSelector(state => state.polylineEventsDisabled.disabled)`
+- Redux-Slice `polylineEventsDisabledSlice.js` final integriert
+- Rückgabe von `setPolylineEventsDisabled` entfernt, da Zustand nun global über Redux verwaltet wird
+
+---
+
 ## [1.1.93] – 2025-05-19
 
 ### Changed
diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js
index e8a1753bd..3dd766fac 100644
--- a/components/mainComponent/MapComponent.js
+++ b/components/mainComponent/MapComponent.js
@@ -96,7 +96,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
 
   const polylinePosition = contextMenuState.position ? L.latLng(contextMenuState.position.lat, contextMenuState.position.lng) : null;
   const currentPoi = useSelector(selectCurrentPoi);
-  //const setCurrentPoi = useSetRecoilState(currentPoiState);
+
   const polylineVisible = useSelector(selectPolylineVisible);
   const [editMode, setEditMode] = useState(false); // editMode Zustand
   const { deviceName, setDeviceName } = useMapComponentState();
@@ -357,7 +357,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
       // Sammle alle Marker in einer einzigen Liste
 
       const editMode = localStorage.getItem("editMode") === "true"; // EditMode prüfen
-      const visibility = mapLayersVisibility || {}; // Sichtbarkeitsstatus aus Recoil
+      const visibility = mapLayersVisibility || {};
 
       allMarkers.forEach((marker) => {
         const layerKey = marker.options?.layerKey; // Layer-Key aus den Marker-Optionen
@@ -603,8 +603,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   useEffect(() => {
     if (map) {
       console.log("6- Karteninstanz (map) wurde jetzt erfolgreich initialisiert");
-
-      // Setze die Karteninstanz in den Recoil-Atom
     }
   }, [map]);
   //--------------------------------------------
diff --git a/config/appVersion.js b/config/appVersion.js
index e3793862c..ef2eade45 100644
--- a/config/appVersion.js
+++ b/config/appVersion.js
@@ -1,2 +1,2 @@
 // /config/appVersion
-export const APP_VERSION = "1.1.93";
+export const APP_VERSION = "1.1.94";
diff --git a/hooks/useCreateAndSetDevices.js b/hooks/useCreateAndSetDevices.js
index b92042746..a7f797a68 100644
--- a/hooks/useCreateAndSetDevices.js
+++ b/hooks/useCreateAndSetDevices.js
@@ -1,15 +1,14 @@
 // /hooks/useCreateAndSetDevices.js
 import { useEffect } from "react";
-import { useRecoilState } from "recoil";
-import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledSlice";
 import { createAndSetDevices } from "../utils/createAndSetDevices";
+import { useSelector } from "react-redux";
 
 const useCreateAndSetDevices = (systemId, setMarkersFunction, GisSystemStatic, priorityConfig) => {
-  const [polylineEventsDisabled, setPolylineEventsDisabled] = useRecoilState(polylineEventsDisabledState);
+  const polylineEventsDisabled = useSelector((state) => state.polylineEventsDisabled.disabled);
 
   useEffect(() => {
-    createAndSetDevices(systemId, setMarkersFunction, GisSystemStatic, priorityConfig, setPolylineEventsDisabled);
-  }, [systemId, setMarkersFunction, GisSystemStatic, priorityConfig, setPolylineEventsDisabled]);
+    createAndSetDevices(systemId, setMarkersFunction, GisSystemStatic, priorityConfig, polylineEventsDisabled);
+  }, [systemId, setMarkersFunction, GisSystemStatic, priorityConfig, polylineEventsDisabled]);
 };
 
 export default useCreateAndSetDevices;