diff --git a/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.ts b/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.ts
index fe91d61e..ae679679 100644
--- a/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.ts
+++ b/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.ts
@@ -74,12 +74,19 @@ export class StatementReviewDialogComponent implements OnInit {
         });
 
         expenseDialog.onClose.subscribe((savedExpense: Expense) => {
-            if (!savedExpense) {
+            if (!(savedExpense instanceof Expense)) {
                 return;
             }
 
             this.removeExpenseFromList(expense);
             this.calendarRefreshNeeded = true;
+
+            if (!this.expenses.length) {
+                this.dialogRef.close({
+                    action: DIALOG_ACTION_CLOSE,
+                    calendarRefreshNeeded: this.calendarRefreshNeeded,
+                });
+            }
         });
     }
 
diff --git a/frontend/src/app/modules/main/services/statement-import.service.ts b/frontend/src/app/modules/main/services/statement-import.service.ts
index 94e2a845..2bdbdea5 100644
--- a/frontend/src/app/modules/main/services/statement-import.service.ts
+++ b/frontend/src/app/modules/main/services/statement-import.service.ts
@@ -8,6 +8,7 @@ import { ExpenseQueries } from '../../../queries/expense.queries';
 import { StatementImportQueries } from '../../../queries/statement-import.queries';
 import {
     DIALOG_ACTION_CANCEL,
+    DIALOG_ACTION_CLOSE,
     DIALOG_ACTION_IMPORT,
     StatementReviewDialogComponent,
 } from '../dialogs/statement-review-dialog/statement-review-dialog.component';
@@ -141,6 +142,13 @@ export class StatementImportService {
                     case DIALOG_ACTION_CANCEL:
                         this.clearImportStorage();
                         break;
+                    case DIALOG_ACTION_CLOSE:
+                        if (!this.expenses.length) {
+                            this.clearImportStorage();
+                        } else {
+                            this.reloadImportStorage();
+                        }
+                        break;
                 }
             });
     }