diff --git a/lib/data/repositories/settings_repository.dart b/lib/data/repositories/settings_repository.dart
index b4a8706a0..2a30cc866 100644
--- a/lib/data/repositories/settings_repository.dart
+++ b/lib/data/repositories/settings_repository.dart
@@ -38,7 +38,7 @@ class SettingsRepository {
   }
 
   Future<CompanyEntity> saveEInvoiceCertificate(Credentials credentials,
-      CompanyEntity company, MultipartFile? eInvoiceCertificate) async {
+      CompanyEntity company, MultipartFile eInvoiceCertificate) async {
     dynamic response;
 
     final url = credentials.url! + '/companies/${company.id}';
@@ -205,7 +205,7 @@ class SettingsRepository {
   }
 
   Future<BaseEntity> uploadLogo(Credentials credentials, String entityId,
-      MultipartFile? multipartFile, EntityType? type) async {
+      MultipartFile multipartFile, EntityType? type) async {
     final route = type == EntityType.company
         ? 'companies'
         : type == EntityType.group
diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart
index d7393685d..96a18fa78 100644
--- a/lib/data/web_client.dart
+++ b/lib/data/web_client.dart
@@ -68,7 +68,7 @@ class WebClient {
     String url,
     String? token, {
     dynamic data,
-    List<MultipartFile?>? multipartFiles,
+    List<MultipartFile>? multipartFiles,
     String? secret,
     String? password,
     String? idToken,
@@ -309,12 +309,12 @@ String _parseError(int code, String response) {
 }
 
 Future<http.Response> _uploadFiles(
-    String url, String? token, List<MultipartFile?> multipartFiles,
+    String url, String? token, List<MultipartFile> multipartFiles,
     {String method = 'POST', dynamic data}) async {
   final request = http.MultipartRequest(method, Uri.parse(url))
     ..fields.addAll(data ?? {})
     ..headers.addAll(_getHeaders(url, token))
-    ..files.addAll(multipartFiles as Iterable<MultipartFile>);
+    ..files.addAll(multipartFiles);
 
   return await http.Response.fromStream(await request.send())
       .timeout(const Duration(minutes: 10));
diff --git a/lib/redux/company/company_actions.dart b/lib/redux/company/company_actions.dart
index 6aca27730..4e5ed8787 100644
--- a/lib/redux/company/company_actions.dart
+++ b/lib/redux/company/company_actions.dart
@@ -58,14 +58,14 @@ class SaveCompanyFailure implements StopSaving {
 
 class SaveEInvoiceCertificateRequest implements StartSaving {
   SaveEInvoiceCertificateRequest({
-    this.completer,
-    this.company,
-    this.eInvoiceCertificate,
+    required this.completer,
+    required this.company,
+    required this.eInvoiceCertificate,
   });
 
-  final Completer? completer;
-  final CompanyEntity? company;
-  final MultipartFile? eInvoiceCertificate;
+  final Completer completer;
+  final CompanyEntity company;
+  final MultipartFile eInvoiceCertificate;
 }
 
 class SaveEInvoiceCertificateSuccess
diff --git a/lib/redux/settings/settings_actions.dart b/lib/redux/settings/settings_actions.dart
index e7c532773..f158bc762 100644
--- a/lib/redux/settings/settings_actions.dart
+++ b/lib/redux/settings/settings_actions.dart
@@ -71,10 +71,10 @@ class UpdateUserSettings implements PersistUI {
 }
 
 class UploadLogoRequest implements StartSaving {
-  UploadLogoRequest({this.completer, this.multipartFile, this.type});
+  UploadLogoRequest({this.completer, required this.multipartFile, this.type});
 
   final Completer? completer;
-  final MultipartFile? multipartFile;
+  final MultipartFile multipartFile;
   final EntityType? type;
 }
 
diff --git a/lib/redux/settings/settings_middleware.dart b/lib/redux/settings/settings_middleware.dart
index d34a46e7c..1766a7535 100644
--- a/lib/redux/settings/settings_middleware.dart
+++ b/lib/redux/settings/settings_middleware.dart
@@ -126,16 +126,16 @@ Middleware<AppState> _saveEInvoiceCertificate(
     settingsRepository
         .saveEInvoiceCertificate(
       store.state.credentials,
-      action.company!,
+      action.company,
       action.eInvoiceCertificate,
     )
         .then((company) {
       store.dispatch(SaveEInvoiceCertificateSuccess(company));
-      action.completer!.complete();
+      action.completer.complete();
     }).catchError((Object error) {
       print(error);
       store.dispatch(SaveEInvoiceCertificateFailure(error));
-      action.completer!.completeError(error);
+      action.completer.completeError(error);
     });
 
     next(action);