diff --git a/providers/universal-provider/src/UniversalProvider.ts b/providers/universal-provider/src/UniversalProvider.ts
index 4ad2cbee4..1ff9c2a87 100644
--- a/providers/universal-provider/src/UniversalProvider.ts
+++ b/providers/universal-provider/src/UniversalProvider.ts
@@ -338,17 +338,26 @@ export class UniversalProvider implements IUniversalProvider {
         accounts,
         chains: approvedChains,
       };
-      switch (namespace) {
-        case "eip155":
-          this.rpcProviders[namespace] = new Eip155Provider({
-            namespace: combinedNamespace,
-          });
-          break;
-        default:
-          this.rpcProviders[namespace] = new GenericProvider({
-            namespace: combinedNamespace,
-          });
-      }
+    switch (namespace) {
+  case "eip155":
+    this.rpcProviders[namespace] = new Eip155Provider({
+      namespace: combinedNamespace,
+    });
+    break;
+
+  case "solana":
+case "solaxy":
+  const SolanaProvider = (await import("./providers/solana.js")).default;
+  this.rpcProviders[namespace] = new SolanaProvider({
+    namespace: combinedNamespace,
+  });
+  break;
+
+  default:
+    this.rpcProviders[namespace] = new GenericProvider({
+      namespace: combinedNamespace,
+    });
+}
     });
   }
 
diff --git a/providers/universal-provider/src/providers/index.ts b/providers/universal-provider/src/providers/index.ts
index 3fc0db630..657c9414c 100644
--- a/providers/universal-provider/src/providers/index.ts
+++ b/providers/universal-provider/src/providers/index.ts
@@ -1,2 +1,3 @@
 export * as Eip155Provider from "./eip155.js";
 export * as GenericProvider from "./generic.js";
+export * as SolanaProvider from "./solana.js";