diff --git a/lib/redux/settings/settings_middleware.dart b/lib/redux/settings/settings_middleware.dart
index ff6210b14..fbd908ba8 100644
--- a/lib/redux/settings/settings_middleware.dart
+++ b/lib/redux/settings/settings_middleware.dart
@@ -59,6 +59,10 @@ Middleware<AppState> _viewSettings() {
 
           next(action);
 
+          if (store.state.isStale) {
+            store.dispatch(RefreshData());
+          }
+
           store.dispatch(UpdateCurrentRoute(route));
 
           if (isMobile(action.context)) {
diff --git a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart
index 2859fd207..781dfd34a 100644
--- a/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart
+++ b/lib/ui/recurring_invoice/edit/recurring_invoice_edit.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/completers.dart';
 
 class RecurringInvoiceEdit extends StatefulWidget {
   const RecurringInvoiceEdit({
@@ -24,15 +22,12 @@ class _RecurringInvoiceEditState extends State<RecurringInvoiceEdit>
   static final GlobalKey<FormState> _formKey =
       GlobalKey<FormState>(debugLabel: '_recurringInvoiceEdit');
   TabController _controller;
-  final _debouncer = Debouncer();
 
   static const kDetailsScreen = 0;
   static const kItemScreen = 1;
 
   // STARTER: controllers - do not remove comment
 
-  List<TextEditingController> _controllers = [];
-
   @override
   void initState() {
     super.initState();