diff --git a/daemon.py b/daemon.py
index 651176e8e..b3fd8e7dc 100644
--- a/daemon.py
+++ b/daemon.py
@@ -14069,7 +14069,8 @@ class PubServer(BaseHTTPRequestHandler):
             nickname = self.path.split('/users/')[1]
             if '/' in nickname:
                 nickname = nickname.split('/')[0]
-            episode_timestamp = self.path.split('?podepisode=')[1]
+            episode_timestamp = self.path.split('?podepisode=')[1].strip()
+            episode_timestamp = episode_timestamp.replace('__', ' ')
             if self.server.newswire.get(episode_timestamp):
                 pod_episode = self.server.newswire[episode_timestamp]
                 html_str = \
diff --git a/webapp_column_right.py b/webapp_column_right.py
index ee007a632..02b4f1ad2 100644
--- a/webapp_column_right.py
+++ b/webapp_column_right.py
@@ -272,8 +272,9 @@ def _html_newswire(base_dir: str, newswire: {}, nickname: str, moderator: bool,
             if podcast_properties:
                 if podcast_properties.get('persons') and \
                    podcast_properties.get('image'):
+                    episode_id = date_str.replace(' ', '__')
                     link_url = \
-                        '/users/' + nickname + '/?podepisode=' + date_str
+                        '/users/' + nickname + '/?podepisode=' + episode_id
 
         html_str += separator_str
         if moderated_item and 'vote:' + nickname in item[2]: