diff --git a/apps/channels/serializers.py b/apps/channels/serializers.py
index ab2c5dfc..310d9feb 100644
--- a/apps/channels/serializers.py
+++ b/apps/channels/serializers.py
@@ -209,7 +209,19 @@ class ChannelSerializer(serializers.ModelSerializer):
 
         # Handle streams if provided
         if stream_ids is not None:
-            instance.streams.set(stream_ids)
+            # Clear existing associations
+            instance.channelstream_set.all().delete()
+
+            # Create new associations with proper ordering
+            for index, stream in enumerate(stream_ids):
+                # Extract the ID from the Stream object
+                actual_stream_id = stream.id if hasattr(stream, "id") else stream
+                print(f'Setting stream {actual_stream_id} to index {index}')
+                ChannelStream.objects.create(
+                    channel=instance,
+                    stream_id=actual_stream_id,
+                    order=index
+                )
 
         return instance
 
diff --git a/version.py b/version.py
index 8e31e3a6..f5e884d0 100644
--- a/version.py
+++ b/version.py
@@ -2,4 +2,4 @@
 Dispatcharr version information.
 """
 __version__ = '0.3.1'  # Follow semantic versioning (MAJOR.MINOR.PATCH)
-__build__ = '0'        # Auto-incremented on builds
+__build__ = '2'        # Auto-incremented on builds