diff --git a/pubspec.yaml b/pubspec.yaml
index f6ebf20e..51b97d14 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://famedly.com
 repository: https://gitlab.com/famedly/company/frontend/famedlysdk.git
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   async: ^2.8.0
diff --git a/test/commands_test.dart b/test/commands_test.dart
index 33068ab8..aecdcb6a 100644
--- a/test/commands_test.dart
+++ b/test/commands_test.dart
@@ -36,7 +36,7 @@ void main() {
       final state = stateKey != null;
       return json.decode(FakeMatrixApi.calledEndpoints.entries
           .firstWhere((e) => e.key.startsWith(
-              '/client/v3/rooms/${Uri.encodeComponent(room.id)}/${state ? 'state' : 'send'}/${Uri.encodeComponent(type)}${state && stateKey?.isNotEmpty == true ? '/${Uri.encodeComponent(stateKey!)}' : ''}'))
+              '/client/v3/rooms/${Uri.encodeComponent(room.id)}/${state ? 'state' : 'send'}/${Uri.encodeComponent(type)}${state && stateKey.isNotEmpty == true ? '/${Uri.encodeComponent(stateKey)}' : ''}'))
           .value
           .first);
     }