diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py
index 6f9f1abf..e9761393 100644
--- a/apps/search_indexes/documents/establishment.py
+++ b/apps/search_indexes/documents/establishment.py
@@ -143,8 +143,8 @@ class EstablishmentDocument(Document):
             'weekday_display': fields.KeywordField(attr='get_weekday_display'),
             'closed_at': fields.KeywordField(attr='closed_at_str'),
             'opening_at': fields.KeywordField(attr='opening_at_str'),
-            # 'closed_at_datetime': fields.DateField(attr='closed_at'),
-            # 'opening_at_datetime': fields.DateField(attr='opening_at'),
+            'closed_at_indexing': fields.DateField(),
+            'opening_at_indexing': fields.DateField(),
         }
     ))
     address = fields.ObjectField(
diff --git a/apps/timetable/models.py b/apps/timetable/models.py
index 07e52807..c9295b3b 100644
--- a/apps/timetable/models.py
+++ b/apps/timetable/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from datetime import time
+from datetime import time, datetime
 
 from utils.models import ProjectBaseMixin
 
@@ -59,6 +59,14 @@ class Timetable(ProjectBaseMixin):
     def opening_at_str(self):
         return str(self.opening_at) if self.opening_at else None
 
+    @property
+    def closed_at_indexing(self):
+        return datetime.combine(time=self.closed_at, date=datetime(1970, 1, 1 + self.weekday).date()) if self.closed_at else None
+
+    @property
+    def opening_at_indexing(self):
+        return datetime.combine(time=self.opening_at, date=datetime(1970, 1, 1 + self.weekday).date()) if self.opening_at else None
+
     @property
     def opening_time(self):
         return self.opening_at or self.lunch_start or self.dinner_start