diff --git a/packages/core/changelog.md b/packages/core/changelog.md
index 3c2b8b04..f11bcaa3 100644
--- a/packages/core/changelog.md
+++ b/packages/core/changelog.md
@@ -333,3 +333,7 @@ function Component() {
 ## 6.1.6(Nov 21, 2025)
 
 - fix(createStorage): use `useLatest` to avoid unnecessary re-renders and simplify dependency arrays
+
+## 6.1.8(Dec 2025)
+
+- fix(useMap): fix type parameter support by moving generics into function signature, now `useMap<string, number>()` works correctly
diff --git a/packages/core/package.json b/packages/core/package.json
index da1781cb..965e72bf 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reactuses/core",
-  "version": "6.1.7",
+  "version": "6.1.8",
   "license": "Unlicense",
   "homepage": "https://www.reactuse.com/",
   "repository": {
diff --git a/packages/core/src/useMap/index.ts b/packages/core/src/useMap/index.ts
index a01b01be..4364d74e 100644
--- a/packages/core/src/useMap/index.ts
+++ b/packages/core/src/useMap/index.ts
@@ -6,7 +6,7 @@ export const useMap: UseMap = <K, V>(
   initialValue?: Map<K, V> | readonly (readonly [K, V])[] | (() => Map<K, V> | readonly (readonly [K, V])[]),
 ) => {
   // avoid exec init code every render
-  const initFunc = () => {
+  const initFunc = (): Map<K, V> => {
     if (typeof initialValue === 'function') {
       const result = initialValue()
       return result instanceof Map ? new Map(result) : new Map(result)
@@ -23,7 +23,7 @@ export const useMap: UseMap = <K, V>(
     return new Map<K, V>()
   }
 
-  const [map, setMap] = useState(initFunc)
+  const [map, setMap] = useState<Map<K, V>>(initFunc)
 
   const set = useEvent((key: K, value: V) => {
     setMap(prevMap => {
diff --git a/packages/core/src/useMap/interface.ts b/packages/core/src/useMap/interface.ts
index 52f6133d..1bcf41ff 100644
--- a/packages/core/src/useMap/interface.ts
+++ b/packages/core/src/useMap/interface.ts
@@ -23,7 +23,7 @@
  * - reset: 將 map 重置為其初始狀態的函數。
  * - size: map 的當前大小。
  */
-export type UseMap<K = any, V = any> = (
+export type UseMap = <K = any, V = any>(
   /**
    * @zh 初始值，可以为 Map 实例、数组或者一个初始化的函数
    * @zh-Hant 初始值，可以為 Map 實例、數組或者一個初始化的函數
diff --git a/packages/website-docusaurus/docs/changelog.md b/packages/website-docusaurus/docs/changelog.md
index 78b061a8..d95a6564 100644
--- a/packages/website-docusaurus/docs/changelog.md
+++ b/packages/website-docusaurus/docs/changelog.md
@@ -340,3 +340,7 @@ function Component() {
 ## 6.1.6(Nov 21, 2025)
 
 - fix(createStorage): use `useLatest` to avoid unnecessary re-renders and simplify dependency arrays
+
+## 6.1.8(Dec 2025)
+
+- fix(useMap): fix type parameter support by moving generics into function signature, now `useMap<string, number>()` works correctly