diff --git a/src/parser/common/types.ts b/src/parser/common/types.ts
index 853673ce..20330305 100644
--- a/src/parser/common/types.ts
+++ b/src/parser/common/types.ts
@@ -44,6 +44,10 @@ export enum EntityContextType {
     COLUMN = 'column',
     /** column name that will be created */
     COLUMN_CREATE = 'columnCreate',
+    /** table property key when creating table*/
+    TABLE_PROPERTY_KEY = 'tablePropertyKey',
+    /** table property value when creating table*/
+    TABLE_PROPERTY_VALUE = 'tablePropertyValue',
 }
 
 /**
diff --git a/src/parser/flink/index.ts b/src/parser/flink/index.ts
index eb727986..138666d2 100644
--- a/src/parser/flink/index.ts
+++ b/src/parser/flink/index.ts
@@ -31,6 +31,8 @@ export class FlinkSQL extends BasicSQL<FlinkSqlLexer, ProgramContext, FlinkSqlPa
         FlinkSqlParser.RULE_functionNameCreate, // functionName that will be created
         FlinkSqlParser.RULE_columnName,
         FlinkSqlParser.RULE_columnNameCreate,
+        FlinkSqlParser.RULE_tablePropertyKey,
+        FlinkSqlParser.RULE_tablePropertyValue,
     ]);
 
     protected get splitListener() {
@@ -104,6 +106,14 @@ export class FlinkSQL extends BasicSQL<FlinkSqlLexer, ProgramContext, FlinkSqlPa
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;
                 }
+                case FlinkSqlParser.RULE_tablePropertyKey: {
+                    syntaxContextType = EntityContextType.TABLE_PROPERTY_KEY;
+                    break;
+                }
+                case FlinkSqlParser.RULE_tablePropertyValue: {
+                    syntaxContextType = EntityContextType.TABLE_PROPERTY_VALUE;
+                    break;
+                }
                 default:
                     break;
             }
diff --git a/test/parser/flink/suggestion/fixtures/tokenSuggestion.sql b/test/parser/flink/suggestion/fixtures/tokenSuggestion.sql
index b8c7ef55..dff1eb6c 100644
--- a/test/parser/flink/suggestion/fixtures/tokenSuggestion.sql
+++ b/test/parser/flink/suggestion/fixtures/tokenSuggestion.sql
@@ -1,7 +1,9 @@
 SELECT * FROM aa.bb;
 
-USE 
+USE
 ;
 CREATE 
 ;
-SHOW 
\ No newline at end of file
+SHOW
+
+CREATE TABLE tmp_table (col INT) WITH ('connector'='kafka');
diff --git a/test/parser/flink/suggestion/tokenSuggestion.test.ts b/test/parser/flink/suggestion/tokenSuggestion.test.ts
index e527d6b8..f2395d8f 100644
--- a/test/parser/flink/suggestion/tokenSuggestion.test.ts
+++ b/test/parser/flink/suggestion/tokenSuggestion.test.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { FlinkSQL } from 'src/parser/flink';
-import { CaretPosition } from 'src/parser/common/types';
+import { CaretPosition, EntityContextType } from 'src/parser/common/types';
 import { commentOtherLine } from 'test/helper';
 
 const tokenSql = fs.readFileSync(path.join(__dirname, 'fixtures', 'tokenSuggestion.sql'), 'utf-8');
@@ -67,4 +67,32 @@ describe('Flink SQL Token Suggestion', () => {
             'JARS',
         ]);
     });
+
+    test('Create Statement table properties', () => {
+        const scenarios = [
+            {
+                caretPosition: {
+                    lineNumber: 9,
+                    column: 45,
+                },
+                entityContextType: EntityContextType.TABLE_PROPERTY_KEY,
+            },
+            {
+                caretPosition: {
+                    lineNumber: 9,
+                    column: 55,
+                },
+                entityContextType: EntityContextType.TABLE_PROPERTY_VALUE,
+            },
+        ];
+
+        scenarios.forEach((scenario) => {
+            const suggestion = flink.getSuggestionAtCaretPosition(
+                commentOtherLine(tokenSql, scenario.caretPosition.lineNumber),
+                scenario.caretPosition
+            )?.syntax;
+
+            expect(suggestion[0].syntaxContextType).toBe(scenario.entityContextType);
+        });
+    });
 });