diff --git a/app/src/protyle/util/Options.ts b/app/src/protyle/util/Options.ts
index bf0f132a3..020be99a8 100644
--- a/app/src/protyle/util/Options.ts
+++ b/app/src/protyle/util/Options.ts
@@ -126,7 +126,7 @@ export class Options {
             url: Constants.UPLOAD_ADDRESS,
             extraData: {},
             fieldName: "file[]",
-            filename: (name: string) => name.replace(/[\\/:*?"'<>|]/g, ""),
+            filename: (name: string) => name.replace(/[\\/:*?"'<>|\[\]\(\)~!`&{}=#%$]/g, ""),
             linkToImgUrl: "",
             withCredentials: false,
         }
diff --git a/kernel/model/upload.go b/kernel/model/upload.go
index 65e7d80a3..ad57efe60 100644
--- a/kernel/model/upload.go
+++ b/kernel/model/upload.go
@@ -100,7 +100,7 @@ func InsertLocalAssets(id string, assetPaths []string, isUpload bool) (succMap m
 				return
 			}
 			f.Close()
-			succMap[fName] = "assets/" + fName
+			succMap[baseName] = "assets/" + fName
 		}
 	}
 	IncSync()
@@ -284,7 +284,7 @@ func Upload(c *gin.Context) {
 				os.RemoveAll(tmpDir2)
 			}
 
-			succMap[fName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
+			succMap[baseName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
 		}
 	}