diff --git a/homeassistant/components/camera/ffmpeg.py b/homeassistant/components/camera/ffmpeg.py
index 8ca72a09261..1bbd263e585 100644
--- a/homeassistant/components/camera/ffmpeg.py
+++ b/homeassistant/components/camera/ffmpeg.py
@@ -55,9 +55,9 @@ class FFmpegCamera(Camera):
         from haffmpeg import ImageFrame, IMAGE_JPEG
         ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
 
-        image = yield from ffmpeg.get_image(
+        image = yield from asyncio.shield(ffmpeg.get_image(
             self._input, output_format=IMAGE_JPEG,
-            extra_cmd=self._extra_arguments)
+            extra_cmd=self._extra_arguments), loop=self.hass.loop)
         return image
 
     @asyncio.coroutine
diff --git a/homeassistant/components/camera/onvif.py b/homeassistant/components/camera/onvif.py
index 711eb75a744..8f30d9c8b8f 100644
--- a/homeassistant/components/camera/onvif.py
+++ b/homeassistant/components/camera/onvif.py
@@ -78,9 +78,9 @@ class ONVIFCamera(Camera):
         ffmpeg = ImageFrame(
             self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)
 
-        image = yield from ffmpeg.get_image(
+        image = yield from asyncio.shield(ffmpeg.get_image(
             self._input, output_format=IMAGE_JPEG,
-            extra_cmd=self._ffmpeg_arguments)
+            extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
         return image
 
     @asyncio.coroutine
diff --git a/homeassistant/components/camera/yi.py b/homeassistant/components/camera/yi.py
index 48af5dc4305..8e41429baea 100644
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -115,8 +115,9 @@ class YiCamera(Camera):
         url = yield from self.hass.async_add_job(self.get_latest_video_url)
         if url != self._last_url:
             ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
-            self._last_image = yield from ffmpeg.get_image(
-                url, output_format=IMAGE_JPEG, extra_cmd=self._extra_arguments)
+            self._last_image = yield from asyncio.shield(ffmpeg.get_image(
+                url, output_format=IMAGE_JPEG,
+                extra_cmd=self._extra_arguments), loop=self.hass.loop)
             self._last_url = url
 
         return self._last_image
diff --git a/homeassistant/components/ffmpeg.py b/homeassistant/components/ffmpeg.py
index f5efa1ef623..fab38096418 100644
--- a/homeassistant/components/ffmpeg.py
+++ b/homeassistant/components/ffmpeg.py
@@ -19,7 +19,7 @@ from homeassistant.helpers.dispatcher import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['ha-ffmpeg==1.7']
+REQUIREMENTS = ['ha-ffmpeg==1.8']
 
 DOMAIN = 'ffmpeg'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index dd52fbbc5d3..ec1f6239026 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -291,7 +291,7 @@ gps3==0.33.3
 gstreamer-player==1.1.0
 
 # homeassistant.components.ffmpeg
-ha-ffmpeg==1.7
+ha-ffmpeg==1.8
 
 # homeassistant.components.media_player.philips_js
 ha-philipsjs==0.0.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 4fbfaef6912..2c52dc8bdc5 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -59,7 +59,7 @@ fuzzywuzzy==0.15.1
 gTTS-token==1.1.1
 
 # homeassistant.components.ffmpeg
-ha-ffmpeg==1.7
+ha-ffmpeg==1.8
 
 # homeassistant.components.sensor.geo_rss_events
 haversine==0.4.5