diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index ce3d55a79e..89d0871468 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -1579,7 +1579,7 @@ gst_omx_video_enc_fill_buffer (GstOMXVideoEnc * self, GstBuffer * inbuf,
       if (!gst_video_frame_map (&frame, info, inbuf, GST_MAP_READ)) {
         GST_ERROR_OBJECT (self, "Invalid input buffer size");
         ret = FALSE;
-        break;
+        goto done;
       }
 
       for (i = 0; i < 3; i++) {
@@ -1615,7 +1615,7 @@ gst_omx_video_enc_fill_buffer (GstOMXVideoEnc * self, GstBuffer * inbuf,
           gst_video_frame_unmap (&frame);
           GST_ERROR_OBJECT (self, "Invalid output buffer size");
           ret = FALSE;
-          break;
+          goto done;
         }
 
         for (j = 0; j < height; j++) {
@@ -1645,7 +1645,7 @@ gst_omx_video_enc_fill_buffer (GstOMXVideoEnc * self, GstBuffer * inbuf,
       if (!gst_video_frame_map (&frame, info, inbuf, GST_MAP_READ)) {
         GST_ERROR_OBJECT (self, "Invalid input buffer size");
         ret = FALSE;
-        break;
+        goto done;
       }
       dest_stride = port_def->format.video.nStride;
 
@@ -1674,7 +1674,7 @@ gst_omx_video_enc_fill_buffer (GstOMXVideoEnc * self, GstBuffer * inbuf,
           gst_video_frame_unmap (&frame);
           GST_ERROR_OBJECT (self, "Invalid output buffer size");
           ret = FALSE;
-          break;
+          goto done;
         }
 
         for (j = 0; j < height; j++) {