diff --git a/lib/pages/token_view/sub_widgets/token_transaction_list_widget.dart b/lib/pages/token_view/sub_widgets/token_transaction_list_widget.dart
index 68f5c76b8..e460fbe53 100644
--- a/lib/pages/token_view/sub_widgets/token_transaction_list_widget.dart
+++ b/lib/pages/token_view/sub_widgets/token_transaction_list_widget.dart
@@ -225,8 +225,8 @@ class _TransactionsListState extends ConsumerState<TokenTransactionsList> {
           _hasLoaded = true;
         }
         if (!_hasLoaded) {
-          return Column(
-            children: const [
+          return const Column(
+            children: [
               Spacer(),
               Center(
                 child: LoadingIndicator(
diff --git a/lib/pages/token_view/token_view.dart b/lib/pages/token_view/token_view.dart
index 8cff2fcfc..54f0efe58 100644
--- a/lib/pages/token_view/token_view.dart
+++ b/lib/pages/token_view/token_view.dart
@@ -191,7 +191,10 @@ class _TokenViewState extends ConsumerState<TokenView> {
                         onTap: () {
                           Navigator.of(context).pushNamed(
                             AllTransactionsView.routeName,
-                            arguments: widget.walletId,
+                            arguments: (
+                              walletId: widget.walletId,
+                              isTokens: true,
+                            ),
                           );
                         },
                       ),
diff --git a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
index 32cd8fb30..002376ca3 100644
--- a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
+++ b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
@@ -17,6 +17,7 @@ import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart'
 import 'package:stackwallet/models/isar/models/contact_entry.dart';
 import 'package:stackwallet/models/transaction_filter.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
+import 'package:stackwallet/pages/token_view/token_view.dart';
 import 'package:stackwallet/pages/wallet_view/sub_widgets/tx_icon.dart';
 import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
 import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_search_filter_view.dart';
@@ -50,11 +51,13 @@ class AllTransactionsView extends ConsumerStatefulWidget {
   const AllTransactionsView({
     Key? key,
     required this.walletId,
+    this.isTokens = false,
   }) : super(key: key);
 
   static const String routeName = "/allTransactions";
 
   final String walletId;
+  final bool isTokens;
 
   @override
   ConsumerState<AllTransactionsView> createState() =>
@@ -445,12 +448,12 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
               ),
             if (isDesktop &&
                 ref.watch(transactionFilterProvider.state).state != null)
-              Padding(
-                padding: const EdgeInsets.symmetric(
+              const Padding(
+                padding: EdgeInsets.symmetric(
                   vertical: 8,
                 ),
                 child: Row(
-                  children: const [
+                  children: [
                     TransactionFilterOptionBar(),
                   ],
                 ),
@@ -472,8 +475,11 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
                   // debugPrint("Consumer build called");
 
                   return FutureBuilder(
-                    future: ref.watch(
-                        managerProvider.select((value) => value.transactions)),
+                    future: widget.isTokens
+                        ? ref.watch(tokenServiceProvider
+                            .select((value) => value!.transactions))
+                        : ref.watch(managerProvider
+                            .select((value) => value.transactions)),
                     builder: (_, AsyncSnapshot<List<Transaction>> snapshot) {
                       if (snapshot.connectionState == ConnectionState.done &&
                           snapshot.hasData) {
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
index 18edc2bff..b03b67959 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
@@ -218,7 +218,10 @@ class _DesktopTokenViewState extends ConsumerState<DesktopTokenView> {
                         onTap: () {
                           Navigator.of(context).pushNamed(
                             AllTransactionsView.routeName,
-                            arguments: widget.walletId,
+                            arguments: (
+                              walletId: widget.walletId,
+                              isTokens: true,
+                            ),
                           );
                         },
                       ),
diff --git a/lib/route_generator.dart b/lib/route_generator.dart
index 448e416a1..454aeaa8d 100644
--- a/lib/route_generator.dart
+++ b/lib/route_generator.dart
@@ -1215,6 +1215,18 @@ class RouteGenerator {
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
       case AllTransactionsView.routeName:
+        if (args is ({String walletId, bool isTokens})) {
+          return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => AllTransactionsView(
+              walletId: args.walletId,
+              isTokens: args.isTokens,
+            ),
+            settings: RouteSettings(
+              name: settings.name,
+            ),
+          );
+        }
         if (args is String) {
           return getRoute(
             shouldUseMaterialRoute: useMaterialPageRoute,