diff --git a/src/node/db/GroupManager.js b/src/node/db/GroupManager.js
index f8255ba36..e65c0dc46 100644
--- a/src/node/db/GroupManager.js
+++ b/src/node/db/GroupManager.js
@@ -236,11 +236,12 @@ exports.createGroupIfNotExistsFor = function(groupMapper, callback)
         // hah, the returned group doesn't exist, let's create one
         createGroupForMapper(callback)
       })
+
+      return;
     }
+
     //there is no group for this mapper, let's create a group
-    else {
-      createGroupForMapper(callback)
-    }
+    createGroupForMapper(callback)
   });
 }