diff --git a/CHANGELOG.md b/CHANGELOG.md
index f17253f..ec12885 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-[6.0.2] 14.11.2024
-* add stricter static type checks
+[7.0.0] 14.11.2024
+* add stricter static type checks. this is a breaking change because the `globalExceptionHandler` correctly has to accept `CommandError<dynamic>` instead of `CommandError<Object>`
 [6.0.1] 29.09.2024
 * Update to latest version of functional_listener to fix a potential bug when removing the last listener from `canExecute`
 [6.0.0] 
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index c00dbf5..69fd764 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   http: ^0.13.0
   flutter_command: 
     path: ../
-  functional_listener: ^3.0.0
+  functional_listener: ^4.0.0
 
 dev_dependencies:
   flutter_lints: ^2.0.1
diff --git a/lib/flutter_command.dart b/lib/flutter_command.dart
index 07f2f0d..087d98f 100644
--- a/lib/flutter_command.dart
+++ b/lib/flutter_command.dart
@@ -268,8 +268,8 @@ abstract class Command<TParam, TResult> extends CustomValueNotifier<TResult> {
         return;
       }
 
-      _commandResult.value =
-          CommandResult<TParam, TResult>(param, result, null, false);
+      _commandResult.value = CommandResult<TParam, TResult>(
+          param, _noReturnValue ? null : result, null, false);
       if (!_noReturnValue) {
         value = result;
       } else {
diff --git a/pubspec.yaml b/pubspec.yaml
index 76c1b46..d900bca 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_command
 description: flutter_command is a way to manage your state based on `ValueListenable` and the `Command` design pattern.
-version: 6.0.2
+version: 7.0.0
 homepage: https://github.com/escamoteur/flutter_command
 
 environment: