diff --git a/HISTORY b/HISTORY
index ee06bd3..09134e6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -114,3 +114,4 @@ VDR Plugin 'satip' Revision History
 - Fixed memory deallocation errors.
 - Cleaned up all scan-build warnings.
 - Refactored the frontend handling.
+- Added the force locking quirk for Triax TSS 400.
diff --git a/server.c b/server.c
index d28de82..ab75420 100644
--- a/server.c
+++ b/server.c
@@ -90,7 +90,9 @@ cSatipServer::cSatipServer(const char *addressP, const char *modelP, const char
      if (strstr(*descriptionM, "fritzdvbc"))            // Fritz!WLAN Repeater DVB-C
         quirkM |= eSatipQuirkPlayPids;
      // These devices contain a frontend locking bug:
-     if (strstr(*descriptionM, "fritzdvbc"))            // Fritz!WLAN Repeater DVB-C
+     if (strstr(*descriptionM, "fritzdvbc") ||          // Fritz!WLAN Repeater DVB-C
+         strstr(*descriptionM, "Triax SatIP Converter") // Triax TSS 400
+        )
         quirkM |= eSatipQuirkForceLock;
      if (quirkM != eSatipQuirkNone)
         info("Malfunctioning '%s' server detected! Please, fix the firmware.", *descriptionM);