diff --git a/lib/src/client/centrifuge.dart b/lib/src/client/centrifuge.dart
index deb98da..8b5624c 100644
--- a/lib/src/client/centrifuge.dart
+++ b/lib/src/client/centrifuge.dart
@@ -268,10 +268,13 @@ base mixin CentrifugeClientSubscriptionMixin
 /// Mixin responsible for queue.
 /// SHOULD BE LAST MIXIN.
 /// {@nodoc}
+@internal
 base mixin CentrifugeQueueMixin on CentrifugeBase {
   /// {@nodoc}
   final CentrifugeEventQueue _eventQueue = CentrifugeEventQueue();
 
+  // TODO(plugfox): add all methods
+
   @override
   Future<void> connect(String url) =>
       _eventQueue.push<void>('connect', () => super.connect(url));
diff --git a/lib/src/subscription/client_subscription_impl.dart b/lib/src/subscription/client_subscription_impl.dart
index 85222c0..aedd6e0 100644
--- a/lib/src/subscription/client_subscription_impl.dart
+++ b/lib/src/subscription/client_subscription_impl.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:centrifuge_dart/centrifuge.dart';
 import 'package:centrifuge_dart/src/model/subscription_states_stream.dart';
 import 'package:centrifuge_dart/src/transport/transport_interface.dart';
+import 'package:centrifuge_dart/src/util/event_queue.dart';
 import 'package:centrifuge_dart/src/util/logger.dart' as logger;
 import 'package:meta/meta.dart';
 import 'package:stack_trace/stack_trace.dart' as st;
@@ -14,7 +15,8 @@ final class CentrifugeClientSubscriptionImpl
     extends CentrifugeClientSubscriptionBase
     with
         CentrifugeClientSubscriptionErrorsMixin,
-        CentrifugeClientSubscriptionSubscribeMixin {
+        CentrifugeClientSubscriptionSubscribeMixin,
+        CentrifugeClientSubscriptionQueueMixin {
   /// {@nodoc}
   CentrifugeClientSubscriptionImpl({
     required super.channel,
@@ -22,11 +24,12 @@ final class CentrifugeClientSubscriptionImpl
     CentrifugeSubscriptionConfig? config,
   }) : super(config: config ?? const CentrifugeSubscriptionConfig.byDefault());
 
-  /* publish(data) - publish data to Subscription channel
-  history(options) - request Subscription channel history
-  presence() - request Subscription channel online presence information
-  presenceStats() - request Subscription channel online presence stats information (number of client connections and unique users in a channel).
- */
+  /*
+    publish(data) - publish data to Subscription channel
+    history(options) - request Subscription channel history
+    presence() - request Subscription channel online presence information
+    presenceStats() - request Subscription channel online presence stats information (number of client connections and unique users in a channel).
+  */
 }
 
 /// {@nodoc}
@@ -231,3 +234,20 @@ base mixin CentrifugeClientSubscriptionSubscribeMixin
     await _transport.close();
   }
 }
+
+/// Mixin responsible for queue.
+/// SHOULD BE LAST MIXIN.
+/// {@nodoc}
+@internal
+base mixin CentrifugeClientSubscriptionQueueMixin
+    on CentrifugeClientSubscriptionBase {
+  /// {@nodoc}
+  final CentrifugeEventQueue _eventQueue = CentrifugeEventQueue();
+
+  // TODO(plugfox): add all methods
+
+  @override
+  Future<void> close() => _eventQueue
+      .push<void>('close', super.close)
+      .whenComplete(_eventQueue.close);
+}