diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index 82562ae..445d7fd 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -107,7 +107,9 @@ class Solr  {
 
 		if ($core) {
 			if (!isset(self::$service_core_singletons[$core])) {
-				self::$service_core_singletons[$core] = self::$service_singleton->serviceForCore($core);
+				self::$service_core_singletons[$core] = self::$service_singleton->serviceForCore(
+					singleton($core)->getIndexName()
+				);
 			}
 
 			return self::$service_core_singletons[$core];