diff --git a/EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs b/EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs
index 8c5aab7..e95d3d1 100644
--- a/EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs
+++ b/EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs
@@ -132,7 +132,7 @@ namespace EFCore.NamingConventions.Internal
             }
 
             public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
-                => true;
+                => other is ExtensionInfo;
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
             {
diff --git a/global.json b/global.json
index a496d16..227d556 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.100-rc.1.21463.6",
     "rollForward": "latestMajor",
-    "allowPrerelease": "false"
+    "allowPrerelease": "true"
   }
 }