diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 25995062e2..72d346def9 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -1345,12 +1345,10 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
   GST_VIDEO_AGGREGATOR_LOCK (vagg);
 
   flow_ret = gst_videoaggregator_check_reconfigure (vagg, timeout);
-  if (flow_ret == GST_FLOW_NEEDS_DATA) {
-    GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
-    return GST_FLOW_OK;
-  } else if (flow_ret != GST_FLOW_OK) {
-    GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
-    return flow_ret;
+  if (flow_ret != GST_FLOW_OK) {
+    if (flow_ret == GST_FLOW_NEEDS_DATA)
+      flow_ret = GST_FLOW_OK;
+    goto unlock_and_return;
   }
 
   output_start_time = gst_videoaggregator_get_next_time (agg);
@@ -1378,14 +1376,13 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
   if (flow_ret == GST_FLOW_NEEDS_DATA && !timeout) {
     GST_DEBUG_OBJECT (vagg, "Need more data for decisions");
     flow_ret = GST_FLOW_OK;
-    goto done;
+    goto unlock_and_return;
   } else if (flow_ret == GST_FLOW_EOS) {
-    GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
     GST_DEBUG_OBJECT (vagg, "All sinkpads are EOS -- forwarding");
-    goto done_unlocked;
+    goto unlock_and_return;
   } else if (flow_ret == GST_FLOW_ERROR) {
     GST_WARNING_OBJECT (vagg, "Error collecting buffers");
-    goto done;
+    goto unlock_and_return;
   }
 
   jitter = gst_videoaggregator_do_qos (vagg, output_start_time);
@@ -1427,14 +1424,13 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
 
     flow_ret = gst_aggregator_finish_buffer (agg, outbuf);
   }
-  goto done_unlocked;
+  return flow_ret;
 
 done:
   if (outbuf)
     gst_buffer_unref (outbuf);
+unlock_and_return:
   GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
-
-done_unlocked:
   return flow_ret;
 }