diff --git a/example/main.dart b/example/main.dart
index fe28798..59a63a2 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -64,13 +64,13 @@ Future<void> main() async {
   // stream
   final streamSubscription = client
       .from('countries')
-      .stream()
+      .stream(['id'])
       .order('name')
       .limit(10)
       .execute()
       .listen((snapshot) {
-    print('snapshot: $snapshot');
-  });
+        print('snapshot: $snapshot');
+      });
 
   // remember to remove subscription
   streamSubscription.cancel();
diff --git a/lib/src/supabase_query_builder.dart b/lib/src/supabase_query_builder.dart
index 9a27749..6a7550c 100644
--- a/lib/src/supabase_query_builder.dart
+++ b/lib/src/supabase_query_builder.dart
@@ -41,17 +41,22 @@ class SupabaseQueryBuilder extends PostgrestQueryBuilder {
 
   /// Notifies of data at the queried table
   ///
+  /// [uniqueColumns] can be either the primary key or a combination of unique columns.
+  ///
   /// ```dart
-  /// supabase.from('chats').stream().execute().listen(_onChatsReceived);
+  /// supabase.from('chats').stream(['my_primary_key']).execute().listen(_onChatsReceived);
   /// ```
   ///
   /// `eq`, `order`, `limit` filter are available to limit the data being queried.
   ///
   /// ```dart
-  /// supabase.from('chats:room_id=eq.123').stream().order('created_at').limit(20).execute().listen(_onChatsReceived);
+  /// supabase.from('chats:room_id=eq.123').stream(['my_primary_key']).order('created_at').limit(20).execute().listen(_onChatsReceived);
   /// ```
-  ///
-  SupabaseStreamBuilder stream() {
-    return SupabaseStreamBuilder(this, streamFilter: _streamFilter);
+  SupabaseStreamBuilder stream(List<String> uniqueColumns) {
+    return SupabaseStreamBuilder(
+      this,
+      streamFilter: _streamFilter,
+      uniqueColumns: uniqueColumns,
+    );
   }
 }
diff --git a/lib/src/supabase_realtime_payload.dart b/lib/src/supabase_realtime_payload.dart
index 06c9f27..778a830 100644
--- a/lib/src/supabase_realtime_payload.dart
+++ b/lib/src/supabase_realtime_payload.dart
@@ -15,6 +15,9 @@ class SupabaseRealtimePayload {
   final Map<String, dynamic>? oldRecord;
 
   /// List of columns that are set as primary key
+  @Deprecated(
+    "The new RLS real-time server no longer sends the required data",
+  )
   final List<String> primaryKeys;
 
   SupabaseRealtimePayload({
@@ -24,7 +27,10 @@ class SupabaseRealtimePayload {
     required this.table,
     required this.newRecord,
     required this.oldRecord,
-    required this.primaryKeys,
+    @Deprecated(
+      "The new RLS real-time server no longer sends the required data",
+    )
+        required this.primaryKeys,
   });
 
   factory SupabaseRealtimePayload.fromJson(Map<String, dynamic> json) {
@@ -60,6 +66,7 @@ class SupabaseRealtimePayload {
       eventType: eventType,
       newRecord: newRecord,
       oldRecord: oldRecord,
+      // ignore: deprecated_member_use_from_same_package
       primaryKeys: primaryKeys,
     );
   }
diff --git a/lib/src/supabase_stream_builder.dart b/lib/src/supabase_stream_builder.dart
index cd7e4c1..456e7db 100644
--- a/lib/src/supabase_stream_builder.dart
+++ b/lib/src/supabase_stream_builder.dart
@@ -40,11 +40,16 @@ class SupabaseStreamBuilder {
   /// `eq` filter used for both postgrest and realtime
   late final StreamPostgrestFilter? _streamFilter;
 
+  /// Used to identify which row has changed
+  final List<String> _uniqueColumns;
+
   SupabaseStreamBuilder(
     SupabaseQueryBuilder queryBuilder, {
     required StreamPostgrestFilter? streamFilter,
+    required List<String> uniqueColumns,
   })  : _queryBuilder = queryBuilder,
-        _streamFilter = streamFilter;
+        _streamFilter = streamFilter,
+        _uniqueColumns = uniqueColumns;
 
   /// Which column to order by and whether it's ascending
   _Order? _orderBy;
@@ -57,7 +62,7 @@ class SupabaseStreamBuilder {
   /// When `ascending` value is true, the result will be in ascending order.
   ///
   /// ```dart
-  /// supabase.from('users').stream().order('username', ascending: false);
+  /// supabase.from('users').stream(['id']).order('username', ascending: false);
   /// ```
   SupabaseStreamBuilder order(String column, {bool ascending = false}) {
     _orderBy = _Order(column: column, ascending: ascending);
@@ -67,7 +72,7 @@ class SupabaseStreamBuilder {
   /// Limits the result with the specified `count`.
   ///
   /// ```dart
-  /// supabase.from('users').stream().limit(10);
+  /// supabase.from('users').stream(['id']).limit(10);
   /// ```
   SupabaseStreamBuilder limit(int count) {
     _limit = count;
@@ -145,7 +150,7 @@ class SupabaseStreamBuilder {
     _addStream();
   }
 
-  static bool _isTargetRecord({
+  bool _isTargetRecord({
     required Map<String, dynamic> record,
     required SupabaseRealtimePayload payload,
   }) {
@@ -155,14 +160,8 @@ class SupabaseStreamBuilder {
     } else if (payload.eventType == 'DELETE') {
       targetRecord = payload.oldRecord!;
     }
-
-    bool isTarget = true;
-    for (final primaryKey in payload.primaryKeys) {
-      if (record[primaryKey] != targetRecord[primaryKey]) {
-        isTarget = false;
-      }
-    }
-    return isTarget;
+    return _uniqueColumns
+        .every((column) => record[column] == targetRecord[column]);
   }
 
   void _sortData() {
diff --git a/test/mock_test.dart b/test/mock_test.dart
index 6fe9b7e..975fba1 100644
--- a/test/mock_test.dart
+++ b/test/mock_test.dart
@@ -84,19 +84,16 @@ void main() {
                   'type': 'INSERT',
                   'columns': [
                     {
-                      'flags': ['key'],
                       'name': 'id',
                       'type': 'int4',
-                      'type_modifier': 4294967295
+                      'type_modifier': 4294967295,
                     },
                     {
-                      'flags': [],
                       'name': 'task',
                       'type': 'text',
                       'type_modifier': 4294967295
                     },
                     {
-                      'flags': [],
                       'name': 'status',
                       'type': 'bool',
                       'type_modifier': 4294967295
@@ -139,7 +136,7 @@ void main() {
   });
 
   test('stream() emits data', () {
-    final stream = client.from('todos').stream().execute();
+    final stream = client.from('todos').stream(['id']).execute();
     expect(
       stream,
       emitsInOrder([
@@ -157,7 +154,7 @@ void main() {
   });
 
   test('Can filter stream results with eq', () {
-    final stream = client.from('todos:status=eq.true').stream().execute();
+    final stream = client.from('todos:status=eq.true').stream(['id']).execute();
     expect(
       stream,
       emitsInOrder([
@@ -173,7 +170,7 @@ void main() {
   });
 
   test('stream() with order', () {
-    final stream = client.from('todos').stream().order('id').execute();
+    final stream = client.from('todos').stream(['id']).order('id').execute();
     expect(
       stream,
       emitsInOrder([
@@ -191,7 +188,8 @@ void main() {
   });
 
   test('stream() with limit', () {
-    final stream = client.from('todos').stream().order('id').limit(2).execute();
+    final stream =
+        client.from('todos').stream(['id']).order('id').limit(2).execute();
     expect(
       stream,
       emitsInOrder([