diff --git a/src/app/modules/reports/components/time-range-form/time-range-form.component.ts b/src/app/modules/reports/components/time-range-form/time-range-form.component.ts
index 052ef446f..2785b7e19 100644
--- a/src/app/modules/reports/components/time-range-form/time-range-form.component.ts
+++ b/src/app/modules/reports/components/time-range-form/time-range-form.component.ts
@@ -1,3 +1,4 @@
+import { ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
@@ -15,7 +16,7 @@ export class TimeRangeFormComponent implements OnInit {
   private startDate = new FormControl('');
   private endDate = new FormControl('');
 
-  constructor(private store: Store<EntryState>) {
+  constructor(private store: Store<EntryState>, private toastrService: ToastrService) {
     this.reportForm = new FormGroup({
       startDate: this.startDate,
       endDate: this.endDate
@@ -34,9 +35,15 @@ export class TimeRangeFormComponent implements OnInit {
   }
 
   onSubmit() {
-    this.store.dispatch(new entryActions.LoadEntriesByTimeRange({
-      start_date: moment(this.startDate.value).startOf('day'),
-      end_date: moment(this.endDate.value).endOf('day'),
-    }));
+    const endDate = moment(this.endDate.value).endOf('day');
+    const startDate = moment(this.startDate.value).startOf('day');
+    if (endDate.isBefore(startDate)) {
+      this.toastrService.error('The end date should be after the start date');
+    } else {
+      this.store.dispatch(new entryActions.LoadEntriesByTimeRange({
+        start_date: moment(this.startDate.value).startOf('day'),
+        end_date: moment(this.endDate.value).endOf('day'),
+      }));
+    }
   }
 }
diff --git a/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts b/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts
index 129640a78..42c708e0b 100644
--- a/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts
+++ b/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts
@@ -1,9 +1,10 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {MockStore, provideMockStore} from '@ngrx/store/testing';
-import {TimeRangeFormComponent} from './time-range-form.component';
-import {EntryState} from '../../../time-clock/store/entry.reducer';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {InputDateComponent} from '../../../shared/components/input-date/input-date.component';
+import { ToastrService, IndividualConfig } from 'ngx-toastr';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { TimeRangeFormComponent } from './time-range-form.component';
+import { EntryState } from '../../../time-clock/store/entry.reducer';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { InputDateComponent } from '../../../shared/components/input-date/input-date.component';
 import * as entryActions from '../../../time-clock/store/entry.actions';
 import * as moment from 'moment';
 
@@ -12,6 +13,10 @@ describe('Reports Page', () => {
     let component: TimeRangeFormComponent;
     let fixture: ComponentFixture<TimeRangeFormComponent>;
     let store: MockStore<EntryState>;
+    const toastrServiceStub = {
+      error: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { }
+    };
+
     const timeEntry = {
       id: '123',
       start_date: new Date(),
@@ -38,7 +43,10 @@ describe('Reports Page', () => {
       TestBed.configureTestingModule({
         imports: [FormsModule, ReactiveFormsModule],
         declarations: [TimeRangeFormComponent, InputDateComponent],
-        providers: [provideMockStore({initialState: state})],
+        providers: [
+          provideMockStore({ initialState: state }),
+          { provide: ToastrService, useValue: toastrServiceStub }
+        ],
       }).compileComponents();
       store = TestBed.inject(MockStore);
 
@@ -54,7 +62,7 @@ describe('Reports Page', () => {
       expect(component).toBeTruthy();
     });
 
-    it('when submitting form a new LoadEntriesByTimeRange action is triggered', () => {
+    it('LoadEntriesByTimeRange action is triggered when start date is before end date', () => {
       const yesterday = moment(new Date()).subtract(1, 'days');
       const today = moment(new Date());
       spyOn(store, 'dispatch');
@@ -77,6 +85,19 @@ describe('Reports Page', () => {
       expect(component.setInitialDataOnScreen).toHaveBeenCalled();
     });
 
+    it('shows an error when the end date is before the start date', () => {
+      spyOn(toastrServiceStub, 'error');
+      const yesterday = moment(new Date()).subtract(1, 'days');
+      const today = moment(new Date());
+      spyOn(store, 'dispatch');
+      component.reportForm.controls.startDate.setValue(today);
+      component.reportForm.controls.endDate.setValue(yesterday);
+
+      component.onSubmit();
+
+      expect(toastrServiceStub.error).toHaveBeenCalled();
+    });
+
     it('setInitialDataOnScreen sets dates in form', () => {
       spyOn(component.reportForm, 'setValue');