diff --git a/jicofo/src/main/java/org/jitsi/jicofo/jibri/JibriSession.java b/jicofo/src/main/java/org/jitsi/jicofo/jibri/JibriSession.java
index 855024d6fb..75571c4bd0 100644
--- a/jicofo/src/main/java/org/jitsi/jicofo/jibri/JibriSession.java
+++ b/jicofo/src/main/java/org/jitsi/jicofo/jibri/JibriSession.java
@@ -368,18 +368,24 @@ synchronized public void stop(Jid initiator)
                 logger.error(
                     "Unexpected response to stop iq: "
                         + (stanza != null ? XmlStringBuilderUtil.toStringOpt(stanza) : "null"));
+                stopError(stopRequest.getTo());
+            }
+        }).onError(exception ->
+        {
+            logger.error("Error from stop request: " + exception.toString());
+            stopError(stopRequest.getTo());
+        });
+    }
 
-                JibriIq error = new JibriIq();
+    private void stopError(Jid jibriJid)
+    {
+        JibriIq error = new JibriIq();
 
-                error.setFrom(stopRequest.getTo());
-                error.setFailureReason(FailureReason.ERROR);
-                error.setStatus(Status.OFF);
+        error.setFrom(jibriJid);
+        error.setFailureReason(FailureReason.ERROR);
+        error.setStatus(Status.OFF);
 
-                processJibriIqFromJibri(error);
-            }
-        }).onError(exception ->
-            logger.error(
-                "Error sending stop iq: " + exception.toString()));
+        processJibriIqFromJibri(error);
     }
 
     private void cleanupSession()