diff --git a/js/apps/system/sessions/setup.js b/js/apps/system/sessions/setup.js
index 593d6a228f..d5abcdd1b6 100644
--- a/js/apps/system/sessions/setup.js
+++ b/js/apps/system/sessions/setup.js
@@ -6,6 +6,6 @@
     sessionsName = applicationContext.collectionName('sessions');
 
   if (db._collection(sessionsName) === null) {
-    db._create(sessionsName);
+    db._create(sessionsName, {isSystem: true});
   }
 }());
\ No newline at end of file
diff --git a/js/apps/system/users/setup.js b/js/apps/system/users/setup.js
index 564bda8c74..5de636f18d 100644
--- a/js/apps/system/users/setup.js
+++ b/js/apps/system/users/setup.js
@@ -6,6 +6,6 @@
     usersName = applicationContext.collectionName('users');
 
   if (db._collection(usersName) === null) {
-    db._create(usersName);
+    db._create(usersName, {isSystem: true});
   }
 }());
\ No newline at end of file
diff --git a/js/server/upgrade-database.js b/js/server/upgrade-database.js
index 53502bf315..aec6e8bc12 100644
--- a/js/server/upgrade-database.js
+++ b/js/server/upgrade-database.js
@@ -790,25 +790,6 @@
       }
     });
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief setupSessions
-///
-/// set up the collection _sessions
-////////////////////////////////////////////////////////////////////////////////
-
-    addTask({
-      name:        "setupSessions",
-      description: "setup _sessions collection",
-
-      mode:        [ MODE_PRODUCTION, MODE_DEVELOPMENT ],
-      cluster:     [ CLUSTER_NONE, CLUSTER_COORDINATOR_GLOBAL ],
-      database:    [ DATABASE_INIT, DATABASE_UPGRADE ],
-
-      task: function () {
-        return createSystemCollection("_sessions", { waitForSync : true });
-      }
-    });
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief setupGraphs
 ///