diff --git a/src/org/jitsi/impl/neomedia/rtp/translator/RTCPFeedbackMessageSender.java b/src/org/jitsi/impl/neomedia/rtp/translator/RTCPFeedbackMessageSender.java
index fa3c2bb85..28722f9aa 100644
--- a/src/org/jitsi/impl/neomedia/rtp/translator/RTCPFeedbackMessageSender.java
+++ b/src/org/jitsi/impl/neomedia/rtp/translator/RTCPFeedbackMessageSender.java
@@ -121,7 +121,7 @@ public boolean sendFIR(int mediaSenderSSRC)
     {
         boolean registerRecurringRunnable = false;
         KeyframeRequester keyframeRequester = kfRequesters.get(mediaSenderSSRC);
-        if (keyframeRequester == null )
+        if (keyframeRequester == null)
         {
             // Avoided repeated creation of unneeded objects until get fails.
             keyframeRequester = new KeyframeRequester(mediaSenderSSRC);
@@ -130,7 +130,12 @@ public boolean sendFIR(int mediaSenderSSRC)
             if (existingKfRequester != null)
             {
                 // Another thread beat this one to putting a keyframe requester.
+                // That other thread is responsible for registering the keyframe
+                // requester with the recurring runnable executor.
                 keyframeRequester = existingKfRequester;
+            }
+            else
+            {
                 registerRecurringRunnable = true;
             }
         }