diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php
index 33c2e100d1..587076d0db 100644
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -88,7 +88,9 @@ class ShowController extends Controller
         $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);
 
         // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
 
         // enrich
         /** @var User $admin */
@@ -129,7 +131,9 @@ class ShowController extends Controller
         $manager     = $this->getManager();
 
         // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
 
         // enrich
         /** @var User $admin */
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
index a80200038d..3864806bb5 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -101,7 +101,9 @@ class ListController extends Controller
         $accounts          = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // #11007 go to the end of the previous day.
-        $this->parameters->set('start', $this->parameters->get('start')->subSecond());
+        $this->parameters->set('start', $this->parameters->get('start')?->subSecond());
+        // #11018 also end of the day.
+        $this->parameters->set('end', $this->parameters->get('end')?->endOfDay());
 
         // enrich
         /** @var User $admin */
diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
index 68c3dc0f12..3068c45d88 100644
--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
@@ -82,10 +82,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
         // TODO clean me up.
 
         $notes            = $this->notes;
-        $objectGroups     = $this->objectGroups;
         $paidDates        = $this->paidDates;
         $payDates         = $this->payDates;
-        $this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) {
+        $this->collection = $this->collection->map(function (Bill $item) use ($notes, $paidDates, $payDates) {
             $id            = (int)$item->id;
             $currency      = $item->transactionCurrency;
             $nem           = $this->getNextExpectedMatch($payDates[$id] ?? []);
@@ -122,10 +121,12 @@ class SubscriptionEnrichment implements EnrichmentInterface
 
             // add object group if available
             if (array_key_exists($id, $this->mappedObjects)) {
-                $key                        = $this->mappedObjects[$id];
-                $meta['object_group_id']    = (string)$objectGroups[$key]['id'];
-                $meta['object_group_title'] = $objectGroups[$key]['title'];
-                $meta['object_group_order'] = $objectGroups[$key]['order'];
+                $key = $this->mappedObjects[$id];
+                if (array_key_exists($key, $this->objectGroups)) {
+                    $meta['object_group_id']    = (string)$this->objectGroups[$key]['id'];
+                    $meta['object_group_title'] = $this->objectGroups[$key]['title'];
+                    $meta['object_group_order'] = $this->objectGroups[$key]['order'];
+                }
             }
 
             // Add notes if available.
diff --git a/changelog.md b/changelog.md
index cb35c5e344..e04c8b79a9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 6.4.1 - 2025-09-15
+
+## 6.4.2 - 2055-10-07
+
+Everything from v6.4.1, plus:
+
+### Fixed
+
+- [Issue 11015](https://github.com/firefly-iii/firefly-iii/issues/11015) (Call to a member function subSecond() on null when viewing accounts) reported by @sirgio145
+- [Issue 11016](https://github.com/firefly-iii/firefly-iii/issues/11016) (Undefined array key 1 when viewing subscriptions) reported by @anuneo
+- [Issue 11018](https://github.com/firefly-iii/firefly-iii/issues/11018) (/v1/accounts balance_difference last day is not accounted for) reported by @ctrl-f5
+
+## 6.4.1 - 2025-10-07
 
 ### Added
 
diff --git a/config/firefly.php b/config/firefly.php
index 35f9953702..8bdd78ce6e 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.4.1',
-    'build_time'                   => 1759814318,
+    'version'                      => '6.4.2',
+    'build_time'                   => 1759824590,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.