diff --git a/pgserver/duck_handler.go b/pgserver/duck_handler.go
index ebfed80..e7909d8 100644
--- a/pgserver/duck_handler.go
+++ b/pgserver/duck_handler.go
@@ -479,7 +479,7 @@ func (h *DuckHandler) executeQuery(ctx *sql.Context, query string, parsed tree.S
 		schema = types.OkResultSchema
 		iter = sql.RowsToRowIter(sql.NewRow(types.OkResult{}))
 	default:
-		rows, err = adapter.QueryCatalog(ctx, query)
+		rows, err = adapter.QueryCatalog(ctx, ConvertToSys(query))
 		if err != nil {
 			break
 		}
diff --git a/pgserver/pg_catalog_handler.go b/pgserver/pg_catalog_handler.go
index 84cb878..8dec651 100644
--- a/pgserver/pg_catalog_handler.go
+++ b/pgserver/pg_catalog_handler.go
@@ -237,9 +237,9 @@ var pgCatalogHandlers = map[string]PGCatalogHandler{
 				return h.handleCurrentSetting(query)
 			}
 			//if pgCatalogRegex.MatchString(sql) {
-			if isSpecialPgCatalog(query) {
-				return h.handlePgCatalog(query)
-			}
+			//if isSpecialPgCatalog(query) {
+			//	return h.handlePgCatalog(query)
+			//}
 			return false, nil
 		},
 	},