diff --git a/api/src/org/labkey/api/data/DbSchema.java b/api/src/org/labkey/api/data/DbSchema.java
index 48e0e5b7d47..73cf37fa3d2 100644
--- a/api/src/org/labkey/api/data/DbSchema.java
+++ b/api/src/org/labkey/api/data/DbSchema.java
@@ -164,7 +164,9 @@ public Module getModule()
         if (null != module)
             fullyQualifiedSchemaName = module.getDatabaseSchemaName(fullyQualifiedSchemaName);
 
-        String schemaName = DbSchema.getDbScopeAndSchemaName(fullyQualifiedSchemaName).second;
+        // Strip the known prefix; getDbScopeAndSchemaName() can't resolve a display name and mis-splits dotted schema names
+        String prefix = DbSchema.getDisplayName(scope, "");
+        String schemaName = fullyQualifiedSchemaName.startsWith(prefix) ? fullyQualifiedSchemaName.substring(prefix.length()) : fullyQualifiedSchemaName;
         Map<String, String> schemaNameMap = SchemaNameCache.get().getSchemaNameMap(scope);
         String metaDataName = schemaNameMap.get(schemaName);