diff --git a/include/misc.php b/include/misc.php
index 9038e8d45..bf376ac9f 100644
--- a/include/misc.php
+++ b/include/misc.php
@@ -3928,11 +3928,11 @@ function unpack_link_id($mid)
 }
 
 function safe_param($s) {
-    return str_replace( ['?', '&', '<', '>', '=', '"', '\'', '%20' ], [ '{3F}', '{26}', '{3C}', '{3E}', '{3D}', '{22}', '{27}' ,  '{20}'], $s);
+    return str_replace( ['?', '&', '<', '>', '=', '"', '\'', '#', '%20' ], [ '{3F}', '{26}', '{3C}', '{3E}', '{3D}', '{22}', '{27}' , '{23}', '{20}'], $s);
 }
 
 function decode_safe_param($s) {
-    return str_replace( [ '{3F}', '{26}', '{3C}', '{3E}', '{3D}', '{22}', '{27}', '{20}' ], ['?', '&', '<', '>', '=', '"', '\'', '%20' ], $s);
+    return str_replace( [ '{3F}', '{26}', '{3C}', '{3E}', '{3D}', '{22}', '{27}', '{23}', '{20}' ], ['?', '&', '<', '>', '=', '"', '\'', '#', '%20' ], $s);
 }
 
 // callback for array_walk