diff --git a/lib/src/platform/platform_filled_button_icon.dart b/lib/src/platform/platform_filled_button_icon.dart
index 27bc049..2c92b43 100644
--- a/lib/src/platform/platform_filled_button_icon.dart
+++ b/lib/src/platform/platform_filled_button_icon.dart
@@ -44,7 +44,7 @@ class PlatformFilledButtonIcon extends StatelessWidget {
         style: style,
         focusNode: focusNode,
         clipBehavior: clipBehavior,
-        autofocus: autofocus,
+        autofocus: autofocus ?? false,
       ),
       cupertino: (context, platform) => CupertinoButton.filled(
         padding: EdgeInsets.all(8.0),
diff --git a/lib/src/platform/platform_text_button_icon.dart b/lib/src/platform/platform_text_button_icon.dart
index 8f5bf48..f2a67ff 100644
--- a/lib/src/platform/platform_text_button_icon.dart
+++ b/lib/src/platform/platform_text_button_icon.dart
@@ -44,7 +44,7 @@ class PlatformTextButtonIcon extends StatelessWidget {
         style: style,
         focusNode: focusNode,
         clipBehavior: clipBehavior,
-        autofocus: autofocus,
+        autofocus: autofocus ?? false,
       ),
       cupertino: (context, platform) => CupertinoButton(
         color: backgroundColor,