diff --git a/Classes/Common/Indexer.php b/Classes/Common/Indexer.php
index e5bb01af5..633128d10 100644
--- a/Classes/Common/Indexer.php
+++ b/Classes/Common/Indexer.php
@@ -349,10 +349,9 @@ protected static function processLogical(Document $document, array $logicalUnit)
                 } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
-                } else {
+                } elseif (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}T.*$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date('Y-m-d\TH:i:s\Z', strtotime($metadata['date'][0])));
                 }
-                $solrDoc->setField('date', $metadata['date'][0]);
             }
             $solrDoc->setField('record_id', $metadata['record_id'][0]);
             $solrDoc->setField('purl', $metadata['purl'][0]);