diff --git a/packages/react-wallet-kit/src/ConnectWalletButton/Components/ConnectWalletModal.tsx b/packages/react-wallet-kit/src/ConnectWalletButton/Components/ConnectWalletModal.tsx
index a7664667..7a1eda15 100644
--- a/packages/react-wallet-kit/src/ConnectWalletButton/Components/ConnectWalletModal.tsx
+++ b/packages/react-wallet-kit/src/ConnectWalletButton/Components/ConnectWalletModal.tsx
@@ -14,9 +14,9 @@ import {
 import { LinkIcon, WalletIcon } from '@heroicons/react/24/solid';
 import React, { useCallback, useState } from 'react';
 import { Certificate } from 'thor-devkit';
+import { useConnex, useWallet } from '../../ConnexProvider';
 import { Dialog } from './Dialog';
 import { WalletSourceRadio } from './WalletSourceRadio';
-import { useConnex, useWallet } from '../../ConnexProvider';
 
 interface ConnectedWalletDialogProps {
     isOpen: boolean;
diff --git a/packages/react-wallet-kit/src/ConnectWalletButton/Constants/Constants.ts b/packages/react-wallet-kit/src/ConnectWalletButton/Constants/Constants.ts
index 8bb8651c..4c411e8c 100644
--- a/packages/react-wallet-kit/src/ConnectWalletButton/Constants/Constants.ts
+++ b/packages/react-wallet-kit/src/ConnectWalletButton/Constants/Constants.ts
@@ -5,7 +5,7 @@ interface SourceInfo {
     logo: string;
 }
 
-const baseLogoUrl = `${process.env.PUBLIC_URL}/images/logo`;
+const baseLogoUrl = `${process.env.PUBLIC_URL || ''}/images/logo`;
 
 export const WalletSources: Record<WalletSource, SourceInfo> = {
     [WalletSource.WalletConnect]: {