diff --git a/blinkpy/blinkpy.py b/blinkpy/blinkpy.py
index 7bde0f3..ebfdbf8 100644
--- a/blinkpy/blinkpy.py
+++ b/blinkpy/blinkpy.py
@@ -194,10 +194,10 @@ class BlinkCamera():
         """Update camera information."""
         self.name = values['name']
         self._status = values['active']
-        self.thumbnail = "{}{}.jpg".format(
-            self.urls.base_url, values['thumbnail'])
         self.clip = "{}{}".format(
             self.urls.base_url, values['video'])
+        thumb_from_clip = self.clip[0:-4]
+        self.thumbnail = "{}.jpg".format(thumb_from_clip)
         self._battery_string = values['battery']
         self.notifications = values['notifications']
 
@@ -245,9 +245,10 @@ class BlinkCamera():
         for element in response:
             try:
                 if str(element['device_id']) == self.id:
+                    clip = element['video']
                     self.thumbnail = (
                         "{}{}.jpg".format(
-                            self.urls.base_url, element['thumbnail'])
+                            self.urls.base_url, clip[0:-4])
                     )
                     return self.thumbnail
             except KeyError:
diff --git a/tests/test_blink_cameras.py b/tests/test_blink_cameras.py
index e902fea..ebabf61 100644
--- a/tests/test_blink_cameras.py
+++ b/tests/test_blink_cameras.py
@@ -39,7 +39,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
             'name': 'foobar',
             'armed': False,
             'active': 'disarmed',
-            'thumbnail': '/test/image',
+            'thumbnail': '/test/clip/clip.jpg',
             'video': '/test/clip/clip.mp4',
             'temp': 70,
             'battery': 3,
@@ -76,7 +76,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
             self.assertEqual(camera.armed, False)
             self.assertEqual(
                 camera.thumbnail,
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera.clip,
@@ -93,7 +93,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
 
         camera_config = self.camera_config
         camera_config['active'] = 'armed'
-        camera_config['thumbnail'] = '/test2/image'
+        camera_config['thumbnail'] = '/test2/clip.jpg'
         camera_config['video'] = '/test2/clip.mp4'
         camera_config['temp'] = 60
         camera_config['battery'] = 0
@@ -104,7 +104,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
             self.assertEqual(camera.armed, True)
             self.assertEqual(
                 camera.thumbnail,
-                "https://rest.test.{}/test2/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test2/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera.clip,
@@ -143,7 +143,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
             self.assertEqual(camera_attr['armed'], False)
             self.assertEqual(
                 camera_attr['thumbnail'],
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera_attr['video'],