diff --git a/src/backend/distributed/relay/relay_event_utility.c b/src/backend/distributed/relay/relay_event_utility.c
index b12146784..0c69b9e1b 100644
--- a/src/backend/distributed/relay/relay_event_utility.c
+++ b/src/backend/distributed/relay/relay_event_utility.c
@@ -164,9 +164,8 @@ RelayEventExtendNames(Node *parseTree, char *schemaName, uint64 shardId)
 			 * performed on CreateStmt should be done here too, we simply *fall
 			 * through* to avoid code repetition.
 			 */
-			__attribute__((fallthrough));
 		}
-
+		/* fallthrough */
 		case T_CreateStmt:
 		{
 			CreateStmt *createStmt = (CreateStmt *) parseTree;
diff --git a/src/backend/distributed/utils/ruleutils_96.c b/src/backend/distributed/utils/ruleutils_96.c
index 7a72dfe89..4073fbee4 100644
--- a/src/backend/distributed/utils/ruleutils_96.c
+++ b/src/backend/distributed/utils/ruleutils_96.c
@@ -4448,10 +4448,8 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags)
 					return false;
 				}
 				/* else do the same stuff as for T_SubLink et al. */
-				/* FALL THROUGH */
-				__attribute__((fallthrough));
 			}
-
+		/* fallthrough */
 		case T_SubLink:
 		case T_NullTest:
 		case T_BooleanTest: