diff --git a/docker-compose.yml b/docker-compose.yml
index ecbabba..23f7dc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,4 +14,5 @@ services:
       GST_PLUGIN_PATH: /opt/app/amazon-kinesis-video-streams-producer-sdk-cpp/build
       no_proxy: $DEVICE_IP
     command: /bin/sh "start_stream.sh"
+    restart: 'unless-stopped'
 
diff --git a/start_stream.sh b/start_stream.sh
index 7379dd0..73d0410 100644
--- a/start_stream.sh
+++ b/start_stream.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-gst-launch-1.0 rtspsrc \
+gst-launch-1.0 --no-fault rtspsrc \
         location="rtsp://$DEVICE_USERNAME:$DEVICE_PASSWORD@$DEVICE_IP/axis-media/media.amp" short-header=TRUE ! rtph264depay ! h264parse ! video/x-h264 !kvssink stream-name="$AWS_KINESIS_STREAM_NAME" storage-size=512 \
         aws-region="$AWS_REGION"