diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index 872b95228f..96cddfeec9 100644
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -135,6 +135,8 @@ class DateTimeFormat
 			$s = 'now';
 		}
 
+		$s = self::fixDateFormat($s);
+
 		/*
 		 * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
 		 * otherwise we end up with -0001-11-30 ...
@@ -173,6 +175,29 @@ class DateTimeFormat
 		return $d->format($format);
 	}
 
+	/**
+	 * Fix weird date formats
+	 *
+	 * @param string $dateString
+	 * @return string
+	 */
+	private static function fixDateFormat(string $dateString): string
+	{
+		$pattern =
+			[
+				['#(\w+), (\d+/\d+/\d+) - (\d+:\d+)#', '$1, $2 $3'],
+				['#(\d+-\d+-\d+)T(\d+:\d+:\d+)ZZ#', '$1T$2Z'],
+				['#(\d+-\d+-\d+)T(\d+:\d+:\d+\.\d+)ZZ#', '$1T$2Z'],
+				['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'],
+				['#(\d+:\d+) (\w+), (\w+) (\d+), (\d+)#', '$1 $2 $3 $4 $5'],
+			];
+
+		foreach ($pattern as $search_replace) {
+			$dateString = preg_replace($search_replace[0], $search_replace[1], $dateString);
+		}
+		return $dateString;
+	}
+
 	/**
 	 * Checks, if the given string is a date with the pattern YYYY-MM
 	 *