diff --git a/.gitignore b/.gitignore
index 66c8f65..db91937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,4 +171,5 @@ poetry.toml
 pyrightconfig.json
 
 ### DVDFab ###
-*.htkrules
\ No newline at end of file
+*.htkrules
+exports.json
\ No newline at end of file
diff --git a/src/server.py b/src/server.py
index 2f18c36..81e297d 100644
--- a/src/server.py
+++ b/src/server.py
@@ -44,6 +44,7 @@ def parse_boundary(data: str) -> dict:
 class ServiceType(Enum):
     STREAM = 'Stream'  # StreamFab
     MUSIC = 'Music'  # MusicFab
+    DEFAULT = 'Default'
 
 
 class Session:
@@ -70,7 +71,7 @@ class Session:
     def __init__(self):
         self._email = None
         self._mac = None
-        self.type = ServiceType.STREAM
+        self.type = ServiceType.DEFAULT
         self.max = 3
         self.export = True
         self.running = {}
@@ -150,7 +151,8 @@ class Session:
                 # Random token for certain fields
                 data[key] = secrets.token_hex(16)
             elif key in ('PS'):
-                data[key] = self.type.value
+                if self.type != ServiceType.DEFAULT:
+                    data[key] = self.type.value
 
                 # Generate an invalid KID
                 data['KD'] = secrets.token_hex(16)
@@ -273,7 +275,7 @@ if __name__ == '__main__':
     # Command-line arguments
     parser.add_argument('--email', type=str, metavar='<email>', help='Email address (default: random)')
     parser.add_argument('--mac', type=str, metavar='<mac>', help='MAC address (default: random)')
-    parser.add_argument('--type', required=False, type=str, choices=[t.name for t in list(ServiceType)], default=ServiceType.STREAM.name, help='Service type')
+    parser.add_argument('--type', required=False, type=str, choices=[t.name for t in list(ServiceType)], default=ServiceType.DEFAULT.name, help='Service type')
     parser.add_argument('--max', type=int, metavar='<max>', default=3, help='Max usage (default: 3)')
     parser.add_argument('--export', action='store_true', help='Export clear content key if available')