diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 042aba111ce81f601e5a1d09a3d33d291252f368..044f0c619875abafa751956d73e3eb4245be4f05 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -889,7 +889,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['more']   = '';
         $link['class']  = $class;
         if($this->date_at) {
-            $params['at'] = $this->date_at;
+            $params = $params.'&at='.urlencode($this->date_at);// Not perfect, but it works
         }
         $link['url']    = wl($id, $params);
         $link['name']   = $name;