diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 463344eb5..c79c0df94 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -90,7 +90,15 @@
 }
 
 - (GCSFolderManager *)folderManager {
-  return [GCSFolderManager defaultFolderManager];
+  static GCSFolderManager *folderManager = nil;
+
+  if (!folderManager)
+    {
+      folderManager = [GCSFolderManager defaultFolderManager];
+      [folderManager setFolderNamePrefix: @"SOGo_"];
+    }
+
+  return folderManager;
 }
 
 - (GCSFolder *)ocsFolderForPath:(NSString *)_path {
@@ -120,8 +128,6 @@
 {
   NSException *result;
 
-  [GCSFolderType setFolderNamePrefix: @"SOGo_"];
-
   result = [[self folderManager] createFolderOfType: [self folderType]
                                  atPath: ocsPath];