diff --git a/src/robot_interface/core/config.py b/src/robot_interface/core/config.py
index 8d4295d..a07e36e 100644
--- a/src/robot_interface/core/config.py
+++ b/src/robot_interface/core/config.py
@@ -68,7 +68,7 @@ class VideoConfig(object):
     ):
         self.camera_index = get_config(camera_index, "VIDEO__CAMERA_INDEX", 0, int)
         self.resolution = get_config(resolution, "VIDEO__RESOLUTION", 2, int)
-        self.color_space = get_config(color_space, "VIDEO__COLOR_SPACE", 11, int)
+        self.color_space = get_config(color_space, "VIDEO__COLOR_SPACE", 13, int)
         self.fps = get_config(fps, "VIDEO__FPS", 15, int)
         self.stream_name = get_config(stream_name, "VIDEO__STREAM_NAME", "Pepper Video")
         self.image_buffer = get_config(image_buffer, "VIDEO__IMAGE_BUFFER", 6, int)
diff --git a/src/robot_interface/endpoints/video_sender.py b/src/robot_interface/endpoints/video_sender.py
index bd2b12e..0777335 100644
--- a/src/robot_interface/endpoints/video_sender.py
+++ b/src/robot_interface/endpoints/video_sender.py
@@ -9,6 +9,8 @@ import zmq
 import threading
 import logging
 
+import struct
+
 from robot_interface.endpoints.socket_base import SocketBase
 from robot_interface.state import state
 from robot_interface.core.config import settings
@@ -26,7 +28,7 @@ class VideoSender(SocketBase):
     """
     def __init__(self, zmq_context, port=settings.agent_settings.video_sender_port):
         super(VideoSender, self).__init__("video")
-        self.create_socket(zmq_context, zmq.PUB, port, [(zmq.CONFLATE,1)])
+        self.create_socket(zmq_context, zmq.PUB, port, [(zmq.SNDHWM,3)])
     
     def start_video_rcv(self):
         """
@@ -59,10 +61,23 @@ class VideoSender(SocketBase):
         :param vid_stream_name: The name of a camera subscription on the video service object vid_service
         :type vid_stream_name: str
         """
-        while not state.exit_event.is_set():
-            try:
-                img = vid_service.getImageRemote(vid_stream_name)
-                #Possibly limit images sent if queuing issues arise
-                self.socket.send(img[settings.video_config.image_buffer])
-            except:
-                logging.warn("Failed to retrieve video image from robot.")
+        try:
+            while not state.exit_event.is_set():
+                try:
+                    img = vid_service.getImageRemote(vid_stream_name)
+                    if img is not None:
+                        raw_data = img[6]
+                        width = img[0]
+                        height = img[1]
+
+                        width_bytes = struct.pack('<I', width)
+                        height_bytes = struct.pack('<I', height)
+
+                        self.socket.send_multipart([width_bytes, height_bytes, raw_data])
+                except KeyboardInterrupt:
+                    logging.info("Video receiving loop interrupted by user.")
+                except:
+                    logging.warn("Failed to retrieve video image from robot.")
+        finally:
+            vid_service.unsubscribe(vid_stream_name)
+            logging.info("Unsubscribed from video stream.")
\ No newline at end of file
diff --git a/test/unit/test_video_sender.py b/test/unit/test_video_sender.py
index 0a86337..dc9ce48 100644
--- a/test/unit/test_video_sender.py
+++ b/test/unit/test_video_sender.py
@@ -5,6 +5,7 @@ University within the Software Project course.
 © Copyright Utrecht University (Department of Information and Computing Sciences)
 """
 
+import struct
 import mock
 import pytest
 import zmq
@@ -53,8 +54,10 @@ def test_video_streaming(zmq_context, mocker):
     # Pepper's image buffer lives at index 6
     mocker.patch.object(settings.video_config, "image_buffer", 6)
 
+    test_width = 320
+    test_height = 240
     mock_video_service = mock.Mock()
-    mock_video_service.getImageRemote.return_value = [None]*6 + ["fake_img"]
+    mock_video_service.getImageRemote.return_value = [test_width, test_height, None, None, None, None, b"fake_img"]
 
     fake_session = mock.Mock()
     fake_session.service.return_value = mock_video_service
@@ -68,12 +71,16 @@ def test_video_streaming(zmq_context, mocker):
 
     sender = VideoSender(zmq_context)
     send_socket = mock.Mock()
-    sender.socket.send = send_socket
+    sender.socket.send_multipart = send_socket
 
     sender.start_video_rcv()
     sender.video_rcv_loop(mock_video_service, "stream_name")
 
-    send_socket.assert_called_with("fake_img")
+    send_socket.assert_called_with([
+    struct.pack('<I', 320),
+    struct.pack('<I', 240),
+    b"fake_img"
+])
 
 
 def test_video_receive_error(zmq_context, mocker):
@@ -96,9 +103,30 @@ def test_video_receive_error(zmq_context, mocker):
 
     sender = VideoSender(zmq_context)
     send_socket = mock.Mock()
-    sender.socket.send = send_socket
+    sender.socket.send_multipart = send_socket
 
     sender.start_video_rcv()
     sender.video_rcv_loop(mock_video_service, "stream_name")
 
     send_socket.assert_not_called()
+
+def test_video_loop_keyboard_interrupt(zmq_context, mocker):
+    """Video loop should handle KeyboardInterrupt gracefully and unsubscribe."""
+    _patch_basics(mocker)
+    _patch_exit_event(mocker)
+    
+    # We mock the video service to raise KeyboardInterrupt when accessed
+    mock_video_service = mock.Mock()
+    mock_video_service.getImageRemote.side_effect = KeyboardInterrupt
+    
+    # Mock logging to verify the specific interrupt message is logged
+    mock_logger = mocker.patch("robot_interface.endpoints.video_sender.logging")
+
+    sender = VideoSender(zmq_context)
+    
+    # Execute the loop
+    sender.video_rcv_loop(mock_video_service, "stream_name")
+
+    # Verify the 'finally' block executed (unsubscribe)
+    mock_video_service.unsubscribe.assert_called_with("stream_name")
+    mock_logger.info.assert_any_call("Unsubscribed from video stream.")