diff --git a/src/main/java/org/jitsi/jigasi/TranscriptionGateway.java b/src/main/java/org/jitsi/jigasi/TranscriptionGateway.java
index c9d0186f..5e17c16f 100644
--- a/src/main/java/org/jitsi/jigasi/TranscriptionGateway.java
+++ b/src/main/java/org/jitsi/jigasi/TranscriptionGateway.java
@@ -156,7 +156,7 @@ private String getCustomTranscriptionServiceClass(String tenant, String roomJid)
 
         if (remoteTranscriptionConfigUrl != null)
         {
-            String tsConfigUrl = remoteTranscriptionConfigUrl + "/" + tenant;
+            String tsConfigUrl;
 
             // this is JaaS specific
             if (remoteTranscriptionConfigUrl.contains("jitsi.net"))
@@ -164,6 +164,11 @@ private String getCustomTranscriptionServiceClass(String tenant, String roomJid)
                 tsConfigUrl = remoteTranscriptionConfigUrl + "?conferenceFullName="
                         + URLEncoder.encode(roomJid, java.nio.charset.StandardCharsets.UTF_8);
             }
+            else
+            {
+                String maybeTenant = tenant == null ? "" : tenant;
+                tsConfigUrl = remoteTranscriptionConfigUrl + "/" + maybeTenant;
+            }
 
             transcriberClass = getTranscriberFromRemote(tsConfigUrl);
             logger.info("Transcriber class retrieved from remote " + remoteTranscriptionConfigUrl