diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
index 0ecafb81c368d982742af911576164d0aa67e9fb..4aaeac88b6a3d9fb43be3425370651c75018f696 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
@@ -185,6 +185,7 @@ public final class ConfigParameters implements IServletPropertiesManager
                 PropertyUtils.getInt(properties, AUTH_CACHE_CLEANUP_TIMER_PERIOD,
                         DEFAULT_AUTH_CACHE_CLEANUP_TIMER_PERIOD_MINS);
         pluginServlets = new LinkedHashMap<String, PluginServletConfig>();
+        addSystemServlets();
         SectionProperties[] pluginServicesProperties =
                 PropertyParametersUtil.extractSectionProperties(properties,
                         Constants.PLUGIN_SERVICES_LIST_KEY, false);
@@ -210,6 +211,19 @@ public final class ConfigParameters implements IServletPropertiesManager
         }
     }
 
+    /**
+     * Register any servlets that are part of the system and should always be available.
+     */
+    private void addSystemServlets()
+    {
+        String servletClass =
+                "ch.systemsx.cisd.openbis.dss.generic.server.DynamicFileTabularDataGraphServlet";
+        String servletPath = "/graphservice/*";
+        PluginServletConfig servletConfig =
+                new PluginServletConfig(servletClass, servletPath, new Properties());
+        pluginServlets.put(servletPath, servletConfig);
+    }
+
     @Override
     public void addServletProperties(String propertiesName, Properties servletProperties)
     {