diff --git a/apps/channels/serializers.py b/apps/channels/serializers.py
index 60516f74..0e4fba76 100644
--- a/apps/channels/serializers.py
+++ b/apps/channels/serializers.py
@@ -66,6 +66,13 @@ class ChannelSerializer(serializers.ModelSerializer):
         required=False
     )
 
+    stream_profile_id = serializers.PrimaryKeyRelatedField(
+        queryset=StreamProfile.objects.all(),
+        source='stream_profile',
+        allow_null=True,
+        required=False
+    )
+
     # Possibly show streams inline, or just by ID
     # streams = StreamSerializer(many=True, read_only=True)
 
diff --git a/apps/epg/api_views.py b/apps/epg/api_views.py
index 021917ca..7d648dc1 100644
--- a/apps/epg/api_views.py
+++ b/apps/epg/api_views.py
@@ -50,8 +50,10 @@ class EPGGridAPIView(APIView):
         responses={200: ProgramDataSerializer(many=True)}
     )
     def get(self, request, format=None):
-        now = timezone.now()
-        twelve_hours_later = now + timedelta(hours=12)
+        # Get current date and reset time to midnight (00:00)
+        now = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
+
+        twelve_hours_later = now + timedelta(hours=24)
         logger.debug(f"EPGGridAPIView: Querying programs between {now} and {twelve_hours_later}.")
         # Use select_related to prefetch EPGData and Channel data
         programs = ProgramData.objects.select_related('epg__channel').filter(