diff --git a/src/vnode/tsdb/src/tsdbMeta.c b/src/vnode/tsdb/src/tsdbMeta.c
index 67bbcc5b1d00629fcda7d27f48fa32b011b22073..04b52242648c16030edef86bc571aaf91f0e34fd 100644
--- a/src/vnode/tsdb/src/tsdbMeta.c
+++ b/src/vnode/tsdb/src/tsdbMeta.c
@@ -206,8 +206,11 @@ static int32_t tsdbCheckTableCfg(STableCfg *pCfg) {
 }
 
 STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) {
-  STable *pTable = *(STable **)taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid));
-  return pTable;
+  void *ptr = taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid));
+
+  if (ptr == NULL) return NULL;
+
+  return *(STable **)ptr;
 }
 
 static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable) {
diff --git a/src/vnode/tsdb/tests/tsdbTests.cpp b/src/vnode/tsdb/tests/tsdbTests.cpp
index 6c61c688f6f0a1a17a46628fd432f1804b607fd4..c6f023c29a5b2aa93948068e0775e7e7d499c02f 100644
--- a/src/vnode/tsdb/tests/tsdbTests.cpp
+++ b/src/vnode/tsdb/tests/tsdbTests.cpp
@@ -4,7 +4,7 @@
 #include "tsdb.h"
 #include "tsdbMeta.h"
 
-TEST(TsdbTest, DISABLED_createTable)  {
+TEST(TsdbTest, createTable)  {
     STsdbMeta *pMeta = tsdbCreateMeta(100);
     ASSERT_NE(pMeta, nullptr);