diff --git a/sarracenia/flowcb/poll/__init__.py b/sarracenia/flowcb/poll/__init__.py
index 0ddc1301a..83d899402 100755
--- a/sarracenia/flowcb/poll/__init__.py
+++ b/sarracenia/flowcb/poll/__init__.py
@@ -513,9 +513,15 @@ def poll_file_post(self, desc, destDir, remote_file):
         msg = sarracenia.Message.fromFileInfo(post_relPath, self.o, desc)
 
         if stat.S_ISDIR(desc.st_mode):
-             msg['fileOp'] = { 'directory':'' }
+            if 'mkdir' not in self.o.fileEvents:
+                return None
+
+            msg['fileOp'] = { 'directory':'' }
              
         elif stat.S_ISLNK(desc.st_mode):
+            if 'link' not in self.o.fileEvents:
+                return None
+
             if not self.o.follow_symlinks:
                 try: 
                     msg['fileOp'] = { 'link': self.dest.readlink(path) }
@@ -524,6 +530,9 @@ def poll_file_post(self, desc, destDir, remote_file):
                     logger.debug('Exception details: ', exc_info=True)
                     return None
 
+        if 'create' not in self.o.fileEvents and 'modify' not in self.o.fileEvents:
+            return None
+
         if self.o.identity_method and (',' in self.o.identity_method):
             m, v = self.o.identity_method.split(',')
             msg['identity'] = {'method': m, 'value': v}