diff --git a/src/hooks/useClientErrorHandler.ts b/src/hooks/useClientErrorHandler.ts
index 642ebbd1..2f49ad01 100644
--- a/src/hooks/useClientErrorHandler.ts
+++ b/src/hooks/useClientErrorHandler.ts
@@ -11,11 +11,20 @@ export type ClientErrorHandler = {
         driveId: string,
         trigger: Trigger,
         status: number,
+        errorMessage: string,
     ) => Promise<void>;
 };
 
 const DELAY_LIMIT = 100000;
 
+const isListenerIdNotFound = (errorMessage: string, listenerId?: string) => {
+    if (!listenerId) return false;
+
+    return errorMessage
+        .toLocaleLowerCase()
+        .includes(`transmitter ${listenerId} not found`);
+};
+
 export const useClientErrorHandler = (): ClientErrorHandler => {
     const [handlingInProgress, setHandlingInProgress] = useState<string[]>([]);
     const [pullResponderTriggerMap, setPullResponderTriggerMap] = useState<
@@ -26,7 +35,7 @@ export const useClientErrorHandler = (): ClientErrorHandler => {
 
     const pullResponderRegisterDelay = useRef<Map<string, number>>(new Map());
 
-    const handleStrands404 = useCallback(
+    const handleStrands400 = useCallback(
         async (driveId: string, trigger: Trigger, handlerCode: string) => {
             setHandlingInProgress(state => [...state, handlerCode]);
 
@@ -84,22 +93,31 @@ export const useClientErrorHandler = (): ClientErrorHandler => {
     );
 
     const strandsErrorHandler: ClientErrorHandler['strandsErrorHandler'] =
-        async (driveId, trigger, status) => {
+        async (driveId, trigger, status, errorMessage) => {
             switch (status) {
-                case 404: {
-                    const handlerCode = `strands:${driveId}:${status}`;
-
-                    if (handlingInProgress.includes(handlerCode)) return;
-                    if (!trigger.data) return;
-
-                    const delay =
-                        pullResponderRegisterDelay.current.get(handlerCode) ||
-                        0;
-
-                    setTimeout(
-                        () => handleStrands404(driveId, trigger, handlerCode),
-                        delay,
-                    );
+                case 400: {
+                    if (
+                        isListenerIdNotFound(
+                            errorMessage,
+                            trigger.data?.listenerId,
+                        )
+                    ) {
+                        const handlerCode = `strands:${driveId}:${status}`;
+
+                        if (handlingInProgress.includes(handlerCode)) return;
+                        if (!trigger.data) return;
+
+                        const delay =
+                            pullResponderRegisterDelay.current.get(
+                                handlerCode,
+                            ) || 0;
+
+                        setTimeout(
+                            () =>
+                                handleStrands400(driveId, trigger, handlerCode),
+                            delay,
+                        );
+                    }
 
                     break;
                 }