diff --git a/package.json b/package.json
index e5bba1d16..3ef25a424 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@material-ui/pickers": "^3.2.10",
     "@material-ui/styles": "^4.10.0",
-    "@nyaruka/flow-editor": "^1.9.8",
+    "@nyaruka/flow-editor": "glific/floweditor#glific-master",
     "@sentry/browser": "^5.18.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^9.3.2",
diff --git a/src/components/floweditor/FlowEditor.tsx b/src/components/floweditor/FlowEditor.tsx
index 8a5b2f368..a0ce2e30f 100644
--- a/src/components/floweditor/FlowEditor.tsx
+++ b/src/components/floweditor/FlowEditor.tsx
@@ -45,6 +45,59 @@ const setConfig = (uuid: any) => {
     localStorage: true,
     mutable: true,
     filters: ['whatsapp'],
+
+    excludeTypes: [
+      'send_broadcast',
+      'add_contact_urn',
+      'remove_contact_groups',
+      'send_email',
+      'set_run_result',
+      'call_resthook',
+      'start_session',
+      'open_ticket',
+      'split_by_expression',
+      'transfer_airtime',
+      'split_by_intent',
+      'split_by_contact_field',
+      'split_by_run_result',
+      'split_by_random',
+      'split_by_groups',
+      'split_by_scheme'
+    ],
+    
+    excludeOperators: [
+      'has_beginning',
+      'has_text',
+      'has_number_lt',
+      'has_number_lte',
+      'has_number_gte',
+      'has_number_gt',
+      'has_date',
+      'has_date_category',
+      'has_date_lt',
+      'has_number_lte',
+      'has_number_gte',
+      'has_number_gt',
+      'has_date',
+      'has_date_category',
+      'has_date_lt',
+      'has_date_eq',
+      'has_date_gt',
+      'has_time',
+      'has_group',
+      'has_category',
+      'has_phone',
+      'has_phone_category',
+      'has_email',
+      'has_email_category',
+      'has_state',
+      'has_state_category',
+      'has_district',
+      'has_ward',
+      'has_error',
+      'has_value',
+      'has_pattern'
+    ],
     help: {
       legacy_extra: 'help.html',
       missing_dependency: 'help.html',