diff --git a/lbrynet/extras/daemon/mime_types.py b/lbrynet/extras/daemon/mime_types.py
index 41ce4d5e9..5af8c1eef 100644
--- a/lbrynet/extras/daemon/mime_types.py
+++ b/lbrynet/extras/daemon/mime_types.py
@@ -154,5 +154,7 @@ types_map = {
 
 def guess_media_type(path):
     _, ext = os.path.splitext(path)
-    default = 'application/octet-stream' if not (ext and ext[1:].strip()) else f'application/x-ext-{ext[1:].strip().lower()}'
-    return types_map.get(ext, default)
+    return types_map.get(
+        ext,
+        'application/octet-stream' if not (ext and ext[1:].strip()) else f'application/x-ext-{ext[1:].strip().lower()}'
+    )
diff --git a/tests/unit/lbrynet_daemon/test_mime_types.py b/tests/unit/lbrynet_daemon/test_mime_types.py
new file mode 100644
index 000000000..5d074e47e
--- /dev/null
+++ b/tests/unit/lbrynet_daemon/test_mime_types.py
@@ -0,0 +1,14 @@
+import unittest
+from lbrynet.extras.daemon import mime_types
+
+
+class TestMimeTypes(unittest.TestCase):
+    def test_mp4_video(self):
+        self.assertEqual("video/mp4", mime_types.guess_media_type("test.mp4"))
+
+    def test_x_ext_(self):
+        self.assertEqual("application/x-ext-lbry", mime_types.guess_media_type("test.lbry"))
+
+    def test_octet_stream(self):
+        self.assertEqual("application/octet-stream", mime_types.guess_media_type("test."))
+        self.assertEqual("application/octet-stream", mime_types.guess_media_type("test"))