diff --git a/owrx/toolbox.py b/owrx/toolbox.py
index 7509dab9..38bd213d 100644
--- a/owrx/toolbox.py
+++ b/owrx/toolbox.py
@@ -375,7 +375,7 @@ class EasSameParser(TextParser):
     def __init__(self, service: bool = False):
         self.reSplit = re.compile(r"(EAS: \S+)")
         # Construct parent object
-        super().__init__(filePrefix="EAS_SAME", service=service)
+        super().__init__(filePrefix="EASSAME", service=service)
 
     def parse(self, msg: bytes):
         # Parse EAS SAME messages
@@ -404,7 +404,4 @@ class EasSameParser(TextParser):
                 del spot['msg']
                 ReportingEngine.getSharedInstance().spot(spot)
 
-        if self.service:
-            return None
-
         return '\n'.join(out)