diff --git a/include/util/tgeosctx.h b/include/util/tgeosctx.h
index 267ba9e049..a4355db29a 100644
--- a/include/util/tgeosctx.h
+++ b/include/util/tgeosctx.h
@@ -32,14 +32,16 @@ typedef struct SGeosContext {
   GEOSWKBReader *WKBReader;
   GEOSWKBWriter *WKBWriter;
 
-  pcre2_code *WKTRegex;
+  pcre2_code       *WKTRegex;
   pcre2_match_data *WKTMatchData;
 
   char errMsg[512];
 } SGeosContext;
 
-SGeosContext* getThreadLocalGeosCtx();
-void destroyThreadLocalGeosCtx();
+SGeosContext *acquireThreadLocalGeosCtx();
+SGeosContext *getThreadLocalGeosCtx();
+const char   *getGeosErrMsg(int32_t code);
+void          taosGeosDestroy();
 
 #ifdef __cplusplus
 }
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index a403f9d1c2..ec3147f49a 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -91,11 +91,11 @@ void taos_cleanup(void) {
   tscDebug("rpc cleanup");
 
   taosConvDestroy();
+  taosGeosDestroy();
 
   tmqMgmtClose();
 
   DestroyRegexCache();
-  destroyThreadLocalGeosCtx();
 
   tscInfo("all local resources released");
   taosCleanupCfg();
diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
index 1d62d4bd90..ae6efa7af4 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
@@ -122,7 +122,7 @@ void dmCleanupDnode(SDnode *pDnode) {
   streamMetaCleanup();
   indexCleanup();
   taosConvDestroy();
-  destroyThreadLocalGeosCtx();
+  taosGeosDestroy();
 
   // compress destroy
   tsCompressExit();
diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index d8a2331980..082d4e7789 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -979,7 +979,7 @@ static int32_t sysTableGetGeomText(char* iGeom, int32_t nGeom, char** output, in
 
   if (TSDB_CODE_SUCCESS != (code = initCtxAsText()) ||
       TSDB_CODE_SUCCESS != (code = doAsText(iGeom, nGeom, &outputWKT))) {
-    qError("geo text for systable failed:%s", getThreadLocalGeosCtx()->errMsg);
+    qError("geo text for systable failed:%s", getGeosErrMsg(code));
     *output = NULL;
     *nOutput = 0;
     return code;
diff --git a/source/libs/geometry/src/geosWrapper.c b/source/libs/geometry/src/geosWrapper.c
index dde34edc91..4f3f7d75c2 100644
--- a/source/libs/geometry/src/geosWrapper.c
+++ b/source/libs/geometry/src/geosWrapper.c
@@ -23,7 +23,8 @@ typedef char (*_geosPreparedRelationFunc_t)(GEOSContextHandle_t handle, const GE
 
 void geosFreeBuffer(void *buffer) {
   if (buffer) {
-    GEOSFree_r(getThreadLocalGeosCtx()->handle, buffer);
+    SGeosContext *pCtx = acquireThreadLocalGeosCtx();
+    if (pCtx) GEOSFree_r(pCtx->handle, buffer);
   }
 }
 
@@ -36,6 +37,11 @@ int32_t initCtxMakePoint() {
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   if (geosCtx->handle == NULL) {
     geosCtx->handle = GEOS_init_r();
     if (geosCtx->handle == NULL) {
@@ -61,6 +67,11 @@ int32_t doMakePoint(double x, double y, unsigned char **outputGeom, size_t *size
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   GEOSGeometry  *geom = NULL;
   unsigned char *wkb = NULL;
 
@@ -166,6 +177,11 @@ int32_t initCtxGeomFromText() {
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   if (geosCtx->handle == NULL) {
     geosCtx->handle = GEOS_init_r();
     if (geosCtx->handle == NULL) {
@@ -202,6 +218,11 @@ int32_t doGeomFromText(const char *inputWKT, unsigned char **outputGeom, size_t
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   GEOSGeometry  *geom = NULL;
   unsigned char *wkb = NULL;
 
@@ -237,6 +258,11 @@ int32_t initCtxAsText() {
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   if (geosCtx->handle == NULL) {
     geosCtx->handle = GEOS_init_r();
     if (geosCtx->handle == NULL) {
@@ -273,6 +299,11 @@ int32_t doAsText(const unsigned char *inputGeom, size_t size, char **outputWKT)
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   GEOSGeometry  *geom = NULL;
   char *wkt = NULL;
 
@@ -304,6 +335,11 @@ int32_t initCtxRelationFunc() {
   int32_t       code = TSDB_CODE_FAILED;
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    code = TSDB_CODE_OUT_OF_MEMORY;
+    return code;
+  }
+
   if (geosCtx->handle == NULL) {
     geosCtx->handle = GEOS_init_r();
     if (geosCtx->handle == NULL) {
@@ -329,6 +365,10 @@ int32_t doGeosRelation(const GEOSGeometry *geom1, const GEOSPreparedGeometry *pr
                        _geosPreparedRelationFunc_t swappedPreparedRelationFn) {
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
 
+  if (!geosCtx) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
   if (!preparedGeom1) {
     if (!swapped) {
       ASSERT(relationFn);
@@ -390,6 +430,9 @@ int32_t doContainsProperly(const GEOSGeometry *geom1, const GEOSPreparedGeometry
 int32_t readGeometry(const unsigned char *input, GEOSGeometry **outputGeom,
                      const GEOSPreparedGeometry **outputPreparedGeom) {
   SGeosContext *geosCtx = getThreadLocalGeosCtx();
+  if (!geosCtx) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
 
   ASSERT(outputGeom);  // it is not allowed if outputGeom is NULL
   *outputGeom = NULL;
diff --git a/source/libs/parser/src/parInsertSql.c b/source/libs/parser/src/parInsertSql.c
index cb94cd42f7..aa6116287e 100644
--- a/source/libs/parser/src/parInsertSql.c
+++ b/source/libs/parser/src/parInsertSql.c
@@ -655,7 +655,7 @@ static int32_t parseTagToken(const char** end, SToken* pToken, SSchema* pSchema,
 
       code = parseGeometry(pToken, &output, &size);
       if (code != TSDB_CODE_SUCCESS) {
-        code = buildSyntaxErrMsg(pMsgBuf, getThreadLocalGeosCtx()->errMsg, pToken->z);
+        code = buildSyntaxErrMsg(pMsgBuf, getGeosErrMsg(code), pToken->z);
       } else if (size + VARSTR_HEADER_SIZE > pSchema->bytes) {
         // Too long values will raise the invalid sql error message
         code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_VALUE_TOO_LONG, pSchema->name);
@@ -1646,7 +1646,7 @@ static int32_t parseValueTokenImpl(SInsertParseContext* pCxt, const char** pSql,
 
       code = parseGeometry(pToken, &output, &size);
       if (code != TSDB_CODE_SUCCESS) {
-        code = buildSyntaxErrMsg(&pCxt->msg, getThreadLocalGeosCtx()->errMsg, pToken->z);
+        code = buildSyntaxErrMsg(&pCxt->msg, getGeosErrMsg(code), pToken->z);
       }
       // Too long values will raise the invalid sql error message
       else if (size + VARSTR_HEADER_SIZE > pSchema->bytes) {
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 71773ced57..daf44ec527 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -441,12 +441,12 @@ static FORCE_INLINE int32_t varToGeometry(char *buf, SScalarParam *pOut, int32_t
   unsigned char *t = NULL;
   char          *output = NULL;
 
-  if (initCtxGeomFromText()) {
-    sclError("failed to init geometry ctx, %s", getThreadLocalGeosCtx()->errMsg);
+  if ((code = initCtxGeomFromText()) != 0) {
+    sclError("failed to init geometry ctx, %s", getGeosErrMsg(code));
     SCL_ERR_JRET(TSDB_CODE_APP_ERROR);
   }
-  if (doGeomFromText(buf, &t, &len)) {
-    sclInfo("failed to convert text to geometry, %s", getThreadLocalGeosCtx()->errMsg);
+  if ((code = doGeomFromText(buf, &t, &len))) {
+    sclInfo("failed to convert text to geometry, %s", getGeosErrMsg(code));
     SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR);
   }
 
diff --git a/source/util/src/tgeosctx.c b/source/util/src/tgeosctx.c
index 47d5cc992b..473b7539fc 100644
--- a/source/util/src/tgeosctx.c
+++ b/source/util/src/tgeosctx.c
@@ -25,16 +25,19 @@ typedef struct {
   SRWLatch      lock;
 } SGeosContextPool;
 
-static SGeosContextPool sGeosPool = {0};
-
+static SGeosContextPool          sGeosPool = {0};
 static threadlocal SGeosContext *tlGeosCtx = NULL;
 
+SGeosContext *acquireThreadLocalGeosCtx() { return tlGeosCtx; }
+
 SGeosContext *getThreadLocalGeosCtx() {
-  if (tlGeosCtx) return tlGeosCtx;
+  if (tlGeosCtx) {
+    return tlGeosCtx;
+  }
 
   taosWLockLatch(&sGeosPool.lock);
   if (sGeosPool.size >= sGeosPool.capacity) {
-    sGeosPool.capacity += 64;
+    sGeosPool.capacity += 128;
     void *tmp = taosMemoryRealloc(sGeosPool.pool, sGeosPool.capacity * sizeof(SGeosContext));
     if (!tmp) {
       taosWUnLockLatch(&sGeosPool.lock);
@@ -51,6 +54,8 @@ SGeosContext *getThreadLocalGeosCtx() {
   return tlGeosCtx;
 }
 
+const char *getGeosErrMsg(int32_t code) { return tlGeosCtx ? tlGeosCtx->errMsg : (code != 0 ? tstrerror(code) : ""); }
+
 static void destroyGeosCtx(SGeosContext *pCtx) {
   if (pCtx) {
     if (pCtx->WKTReader) {
@@ -86,8 +91,8 @@ static void destroyGeosCtx(SGeosContext *pCtx) {
   }
 }
 
-void destroyThreadLocalGeosCtx() {
-  uInfo("geos ctx is cleaned up");
+void taosGeosDestroy() {
+  uInfo("geos is cleaned up");
   if (!sGeosPool.pool) return;
   for (int32_t i = 0; i < sGeosPool.size; ++i) {
     destroyGeosCtx(sGeosPool.pool + i);
diff --git a/source/util/src/tsched.c b/source/util/src/tsched.c
index 509dba0890..55a927f340 100644
--- a/source/util/src/tsched.c
+++ b/source/util/src/tsched.c
@@ -178,8 +178,6 @@ void *taosProcessSchedQueue(void *scheduler) {
       (*(msg.tfp))(msg.ahandle, msg.thandle);
   }
 
-  // destroyThreadLocalGeosCtx();
-
   return NULL;
 }
 
diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c
index 2da1abed78..ebec134c91 100644
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
@@ -105,7 +105,6 @@ static void *tQWorkerThreadFp(SQueueWorker *worker) {
     taosUpdateItemSize(qinfo.queue, 1);
   }
 
-  // destroyThreadLocalGeosCtx();
   DestoryThreadLocalRegComp();
 
   return NULL;
@@ -665,7 +664,6 @@ static void *tQueryAutoQWorkerThreadFp(SQueryAutoQWorker *worker) {
     }
   }
 
-  // destroyThreadLocalGeosCtx();
   DestoryThreadLocalRegComp();
 
   return NULL;
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 0ccbd683dc..2c8330c433 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -611,14 +611,14 @@ void shellPrintGeometry(const unsigned char *val, int32_t length, int32_t width)
 
   code = initCtxAsText();
   if (code != TSDB_CODE_SUCCESS) {
-    shellPrintString(getThreadLocalGeosCtx()->errMsg, width);
+    shellPrintString(getGeosErrMsg(code), width);
     return;
   }
 
   char *outputWKT = NULL;
   code = doAsText(val, length, &outputWKT);
   if (code != TSDB_CODE_SUCCESS) {
-    shellPrintString(getThreadLocalGeosCtx()->errMsg, width);  // should NOT happen
+    shellPrintString(getGeosErrMsg(code), width);  // should NOT happen
     return;
   }
 
@@ -1282,7 +1282,6 @@ void *shellThreadLoop(void *arg) {
       taosResetTerminalMode();
     } while (shellRunCommand(command, true) == 0);
 
-    destroyThreadLocalGeosCtx();
     taosMemoryFreeClear(command);
     shellWriteHistory();
     shellExit();