diff --git a/scripts-available/CDB_GhostTables.sql b/scripts-available/CDB_GhostTables.sql
index 2e2ddeb..c1d916e 100644
--- a/scripts-available/CDB_GhostTables.sql
+++ b/scripts-available/CDB_GhostTables.sql
@@ -91,9 +91,10 @@ CREATE OR REPLACE FUNCTION CDB_EnableGhostTablesTrigger()
 RETURNS void
 AS $$
   BEGIN
+    DROP EVENT TRIGGER IF EXISTS link_ghost_tables;
     CREATE EVENT TRIGGER link_ghost_tables
     ON ddl_command_end
-    WHEN TAG IN ('CREATE TABLE', 'SELECT INTO', 'DROP TABLE', 'ALTER TABLE', 'CREATE TRIGGER', 'DROP TRIGGER', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW')
+    WHEN TAG IN ('CREATE TABLE', 'SELECT INTO', 'DROP TABLE', 'ALTER TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
     EXECUTE PROCEDURE CDB_SaveDDLTransaction();
   END;
 $$ LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
@@ -103,6 +104,6 @@ CREATE OR REPLACE FUNCTION CDB_DisableGhostTablesTrigger()
 RETURNS void
 AS $$
   BEGIN
-    DROP EVENT TRIGGER link_ghost_tables;
+    DROP EVENT TRIGGER IF EXISTS link_ghost_tables;
   END;
 $$ LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;