diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c
index c3b715268a..9718f8ffb6 100644
--- a/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c
@@ -513,9 +513,9 @@ eos:
       flow_ret = GST_FLOW_EOS;
     }
     g_mutex_unlock (&self->drain_lock);
-
     self->downstream_flow_ret = flow_ret;
 
+    /* Here we fallback and pause the task for the EOS case */
     if (flow_ret != GST_FLOW_OK)
       goto flow_error;
 
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index be7e1f82c3..12f7634e3f 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1642,6 +1642,7 @@ eos:
     g_mutex_unlock (&self->drain_lock);
     self->downstream_flow_ret = flow_ret;
 
+    /* Here we fallback and pause the task for the EOS case */
     if (flow_ret != GST_FLOW_OK)
       goto flow_error;
 
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index 69ae3cc58d..d4d001e863 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -909,6 +909,7 @@ eos:
     g_mutex_unlock (&self->drain_lock);
     self->downstream_flow_ret = flow_ret;
 
+    /* Here we fallback and pause the task for the EOS case */
     if (flow_ret != GST_FLOW_OK)
       goto flow_error;