diff --git a/shared/jekyll_import.py b/shared/jekyll_import.py
index 786a3489d6986ae693b8faf4fdea43ec1bd1bcae..d0d999b5f87796ac140530a84d66aaf4fefe9d2b 100644
--- a/shared/jekyll_import.py
+++ b/shared/jekyll_import.py
@@ -619,9 +619,40 @@ class JekyllArticleImporter:
                 ).replace(tzinfo=datetime_timezone.utc)
             else:
                 parsed_date = meta["date"].split()[0]
-                article.timestamp = parsed_date[0:10] if parsed_date else timezone.now()
+
+                if parsed_date:
+                    article.timestamp = datetime.strptime(
+                        parsed_date[0:10], "%Y-%m-%d"
+                    ).replace(tzinfo=datetime_timezone.utc)
+                else:
+                    log_message = (
+                        "Článek {} má nesprávné datum: {}, nastavuji dnešní".format(
+                            title, meta["date"]
+                        )
+                    )
+
+                    logger.warning(log_message)
+                    self.page_log += "{} - {}\n".format(log_message, meta)
+
+                    article.timestamp = timestamp.now()
         else:
-            article.timestamp = timezone.now()
+            filename = os.path.basename(file_path)
+
+            parsed_date = "-".join(filename.split("-")[:3])
+
+            if parsed_date:
+                article.timestamp = datetime.strptime(parsed_date, "%Y-%m-%d").replace(
+                    tzinfo=datetime_timezone.utc
+                )
+            else:
+                log_message = (
+                    "Článek {} má nesprávné datum: {}, nastavuji dnešní".format(
+                        title, meta["date"]
+                    )
+                )
+
+                logger.warning(log_message)
+                self.page_log += "{} - {}\n".format(log_message, meta)
 
         article.title = meta["title"]
         article.author = meta.get("author", "Česká pirátská strana")