diff --git a/lib/ui/app/desktop_session_timeout.dart b/lib/ui/app/desktop_session_timeout.dart
index f49a827f1..2295df7de 100644
--- a/lib/ui/app/desktop_session_timeout.dart
+++ b/lib/ui/app/desktop_session_timeout.dart
@@ -90,11 +90,11 @@ class _DesktopSessionTimeoutState extends State<DesktopSessionTimeout> {
                       onPressed: () {
                         final store = StoreProvider.of<AppState>(context);
                         final completer = Completer<Null>();
-                        completer.future.then((value) {
+                        completer.future.then(() {
                           setState(() {
                             _isWarned = false;
                           });
-                        } as FutureOr<_> Function(Null));
+                        } as FutureOr<Null> Function(Null));
                         store.dispatch(RefreshData(completer: completer));
                       },
                       child: Text(
diff --git a/lib/ui/app/dialogs/health_check_dialog.dart b/lib/ui/app/dialogs/health_check_dialog.dart
index d9aa8f690..e34e98f6e 100644
--- a/lib/ui/app/dialogs/health_check_dialog.dart
+++ b/lib/ui/app/dialogs/health_check_dialog.dart
@@ -88,9 +88,9 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
     webClient.get(url, credentials.token).then((dynamic response) {
       store.dispatch(RefreshData(
           completer: Completer<Null>()
-            ..future.then((value) {
+            ..future.then<Null>(() {
               runCheck();
-            } as FutureOr<_> Function(Null))));
+            } as FutureOr<Null> Function(Null))));
     }).catchError((dynamic error) {
       showErrorDialog(message: error);
     });
diff --git a/lib/ui/app/dialogs/multiselect_dialog.dart b/lib/ui/app/dialogs/multiselect_dialog.dart
index 785c7a344..faa933811 100644
--- a/lib/ui/app/dialogs/multiselect_dialog.dart
+++ b/lib/ui/app/dialogs/multiselect_dialog.dart
@@ -122,8 +122,9 @@ class MultiSelectListState extends State<MultiSelectList> {
           columnTitle.isEmpty ? lookupOption(option) : columnTitle;
     });
     final keys = options.keys.toList();
-    keys.sort((a, b) =>
-        lookupOption(a!)!.toLowerCase().compareTo(lookupOption(b!)!.toLowerCase()));
+    keys.sort((a, b) => lookupOption(a!)!
+        .toLowerCase()
+        .compareTo(lookupOption(b!)!.toLowerCase()));
 
     final column = Container(
       width: isMobile(context) ? double.maxFinite : 400,