diff --git a/splitio/lib/splitio.dart b/splitio/lib/splitio.dart
index 82e4bfa..a037b11 100644
--- a/splitio/lib/splitio.dart
+++ b/splitio/lib/splitio.dart
@@ -77,7 +77,11 @@ class Splitio {
       ClientReadinessCallback? onReadyFromCache,
       ClientReadinessCallback? onUpdated,
       ClientReadinessCallback? onTimeout}) {
-    String? key = matchingKey ?? _defaultMatchingKey;
+    String key = matchingKey ?? _defaultMatchingKey;
+    if (matchingKey == null && bucketingKey == null) {
+      bucketingKey = _defaultBucketingKey;
+    }
+
     _platform.getClient(matchingKey: key, bucketingKey: bucketingKey);
 
     var client = DefaultSplitClient(_platform, key, bucketingKey);
diff --git a/splitio/test/splitio_platform_stub.dart b/splitio/test/splitio_platform_stub.dart
index 001d7b3..5fb3af6 100644
--- a/splitio/test/splitio_platform_stub.dart
+++ b/splitio/test/splitio_platform_stub.dart
@@ -1,6 +1,5 @@
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:splitio_platform_interface/splitio_platform_interface.dart';
-import 'package:splitio_platform_interface/split_evaluation_options.dart';
 
 class SplitioPlatformStub
     with MockPlatformInterfaceMixin
diff --git a/splitio_platform_interface/lib/split_impression.dart b/splitio_platform_interface/lib/split_impression.dart
index 3bfdf4e..b3df44d 100644
--- a/splitio_platform_interface/lib/split_impression.dart
+++ b/splitio_platform_interface/lib/split_impression.dart
@@ -13,11 +13,9 @@ class Impression {
       this.appliedRule, this.changeNumber, this.attributes, this.properties);
 
   static Impression fromMap(Map<dynamic, dynamic> map) {
-    var properties = null;
+    Map<String, dynamic>? properties;
     if (map['properties'] != null) {
       properties = Map<String, dynamic>.from(map['properties'] as Map);
-    } else {
-      properties = null;
     }
     return Impression(
         map['key'] as String?,