diff --git a/pom.xml b/pom.xml
index 59c81a3e4..28b9a4dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.17</version>
+    <version>1.3.18</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 22564bdb5..ec38e8333 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -530,7 +530,11 @@
                 <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
                 </foreach>
             </if>
-            <if test="source != 'ALL'">
+            <if test="source==null">
+                AND
+                o.source != 'system'
+            </if>
+            <if test="source!=null and source != 'ALL'">
                 AND
                 o.source = #{source}
             </if>