diff --git a/recurring_events.views.inc b/recurring_events.views.inc
index f64c0b95dfa95f4c180c4470454a227c36da0ecc..d1b34940018b374690280bf99f1ce15918e762c1 100644
--- a/recurring_events.views.inc
+++ b/recurring_events.views.inc
@@ -55,4 +55,20 @@ function recurring_events_views_data_alter(array &$data) {
   if (!$set) {
     $data['eventinstance_field_data']['table']['base']['defaults']['field'] = 'id';
   }
+
+  // @todo Remove these declarations when
+  // https://www.drupal.org/project/drupal/issues/2489476 is resolved.
+  $data['eventinstance_field_data']['date__value']['filter']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['filter']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__value']['sort']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['sort']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__value']['argument']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['argument']['field_name'] = 'date';
+
+  $data['eventinstance_field_data']['date__end_value']['filter']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['filter']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__end_value']['sort']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['sort']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__end_value']['argument']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['argument']['field_name'] = 'date';
 }