diff --git a/SoObjects/SOGo/WOContext+SOGo.m b/SoObjects/SOGo/WOContext+SOGo.m
index d5421f01f..19705185c 100644
--- a/SoObjects/SOGo/WOContext+SOGo.m
+++ b/SoObjects/SOGo/WOContext+SOGo.m
@@ -48,6 +48,11 @@
 
   if ([theme length] > 0)
     {
+      if ([theme hasSuffix: @"/"])
+        {
+          // Remove trailing slash
+          theme = [theme substringToIndex: [theme length] - 1];
+        }
       [languages addObject: [NSString stringWithFormat: @"theme_%@", theme]];
       [self setObject: theme forKey: @"theme"];
     }