diff --git a/omnioperator/omniop-openlookeng-extension/src/main/java/nova/hetu/olk/operator/filterandproject/OmniMergingPageOutput.java b/omnioperator/omniop-openlookeng-extension/src/main/java/nova/hetu/olk/operator/filterandproject/OmniMergingPageOutput.java
index 2927ea0b98b042045866c5895c15e1fd0f2edd6f..28ce75ccb0ffa8615c6722615515e41792ab511f 100644
--- a/omnioperator/omniop-openlookeng-extension/src/main/java/nova/hetu/olk/operator/filterandproject/OmniMergingPageOutput.java
+++ b/omnioperator/omniop-openlookeng-extension/src/main/java/nova/hetu/olk/operator/filterandproject/OmniMergingPageOutput.java
@@ -267,8 +267,8 @@ public class OmniMergingPageOutput
     public void close()
     {
         // free input page due to it may not be handled
-        while (currentInput != null) {
-            if (currentInput.hasNext()) {
+        if (currentInput != null) {
+            while (currentInput.hasNext()) {
                 Optional<Page> page = currentInput.next();
                 if (page.isPresent()) {
                     BlockUtils.freePage(page.get());