diff --git a/CHANGES b/CHANGES
index 64c49051..cbd122e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.3 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Fix ip tree lookup on netmask content
+   [Issue #1793 - @tinselcity, @zimmerle]
  - Changes the behavior of the default sec actions
    [Issue #1629 - @mirkodziadzka-avi, @zimmerle, @victorhora]
  - Refactoring on {global,ip,resources,session,tx,user} collections
diff --git a/src/utils/msc_tree.cc b/src/utils/msc_tree.cc
index b65fd847..0cbe0cc2 100644
--- a/src/utils/msc_tree.cc
+++ b/src/utils/msc_tree.cc
@@ -755,7 +755,7 @@ TreeNode *CPTFindElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
         return node;
     }
 
-    if (memcmp(node->prefix->buffer, temp_data, bytes) == 0) {
+    if ((node->netmasks == NULL) && memcmp(node->prefix->buffer, temp_data, bytes) == 0) {
         mask = SHIFT_LEFT_MASK(8 - ip_bitmask % 8);
 
         if ((ip_bitmask % 8) == 0) {