diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index d994682b2..0e03c2467 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -475,6 +475,18 @@ class TestFormatSelection(unittest.TestCase):
         ydl.process_ie_result(info_dict.copy())
         self.assertEqual(ydl.downloaded_info_dicts[0]['format_id'], 'video+audio')
 
+    def test_format_selection_non_audio_video(self):
+        formats = [
+            {'format_id': 'audio', 'url': TEST_URL, 'ext': 'm4a', 'vcodec': 'none'},
+            {'format_id': 'chapter', 'ext': 'mhtml', 'acodec': 'none', 'vcodec': 'none', 'url': 'about:invalid'},
+            {'format_id': 'video', 'url': TEST_URL, 'ext': 'mp4', 'acodec': 'none'},
+        ]
+        info_dict = _make_result(formats)
+
+        ydl = YDL({'format': 'bestvideo+bestaudio'})
+        ydl.process_ie_result(info_dict.copy())
+        self.assertEqual(ydl.downloaded_info_dicts[0]['format_id'], 'video+audio')
+
     def test_invalid_format_specs(self):
         def assert_syntax_error(format_spec):
             ydl = YDL({'format': format_spec})
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 9e5620eef..4b37f6bb8 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1457,25 +1457,25 @@ class YoutubeDL(object):
                     elif format_spec == 'bestaudio':
                         audio_formats = [
                             f for f in formats
-                            if f.get('vcodec') == 'none']
+                            if f.get('vcodec') == 'none' and f.get('acodec') != 'none']
                         if audio_formats:
                             yield audio_formats[-1]
                     elif format_spec == 'worstaudio':
                         audio_formats = [
                             f for f in formats
-                            if f.get('vcodec') == 'none']
+                            if f.get('vcodec') == 'none' and f.get('acodec') != 'none']
                         if audio_formats:
                             yield audio_formats[0]
                     elif format_spec == 'bestvideo':
                         video_formats = [
                             f for f in formats
-                            if f.get('acodec') == 'none']
+                            if f.get('acodec') == 'none' and f.get('vcodec') != 'none']
                         if video_formats:
                             yield video_formats[-1]
                     elif format_spec == 'worstvideo':
                         video_formats = [
                             f for f in formats
-                            if f.get('acodec') == 'none']
+                            if f.get('acodec') == 'none' and f.get('vcodec') != 'none']
                         if video_formats:
                             yield video_formats[0]
                     else: