diff --git a/dspace/config/crosswalks/oai/xoai.xml b/dspace/config/crosswalks/oai/xoai.xml
index 389987dfc3e0..693b3439471d 100644
--- a/dspace/config/crosswalks/oai/xoai.xml
+++ b/dspace/config/crosswalks/oai/xoai.xml
@@ -635,6 +635,19 @@
             </Definition>
         </Filter>
 
+        <Filter id="publicationOrJournalSetFilter">
+	    <Definition>
+		<Or>
+		    <LeftCondition>
+			<Custom ref="publicationSetFilter" />
+		    </LeftCondition>
+		    <RightCondition>
+		        <Custom ref="journalSetFilter" />
+		    </RightCondition>
+		</Or>
+	    </Definition>
+        </Filter>
+
         <!-- This condition determines if an Item has a "dc.type" field
              which contains "Thesis". -->
         <CustomCondition id="thesisDocumentTypeCondition">
@@ -830,20 +843,6 @@
             </Configuration>
         </CustomCondition>
 
-
-        <Filter id="publicationOrJournalSetFilter">
-            <Definition>
-            	<Or>
-            		<LeftCondition>
-						<Custom ref="publicationSetFilter" />
-					</LeftCondition>
-                	<RightCondition>
-                		<Custom ref="journalSetFilter" />
-                	</RightCondition>
-                </Or>
-            </Definition>
-        </Filter>
-
         <CustomCondition id="publicationSetFilter">
             <Class>org.dspace.xoai.filter.DSpaceAtLeastOneMetadataFilter</Class>
             <Configuration>