diff --git a/src/cmd.py b/src/cmd.py
index 15a650c..188f1da 100644
--- a/src/cmd.py
+++ b/src/cmd.py
@@ -165,8 +165,8 @@ class NewInteractiveShell:
     async def _get_available_device(self, storefront: str):
         devices = self.storefront_device_mapping.get(storefront)
         if not devices:
-            logger.warning(f"No device is available to decrypt the specified region: {storefront}. "
-                           f"Use storefront {self.config.region.defaultStorefront} to decrypt")
+            logger.warning(f"No device is available to decrypt the specified region: {storefront.upper()}. "
+                           f"Use storefront {self.config.region.defaultStorefront.upper()} to decrypt")
             storefront = self.config.region.defaultStorefront
             devices = self.storefront_device_mapping.get(storefront)
         available_devices = [device for device in devices if not device.decryptLock.locked()]
diff --git a/src/rip.py b/src/rip.py
index 47adcfb..6a2e9c3 100644
--- a/src/rip.py
+++ b/src/rip.py
@@ -43,7 +43,7 @@ async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config
             return
         await song_metadata.get_cover(config.download.coverFormat, config.download.coverSize)
         if song_data.attributes.hasTimeSyncedLyrics:
-            if song.storefront != auth_params.storefront:
+            if song.storefront.upper() != auth_params.storefront.upper():
                 logger.warning(f"No account is available for getting lyrics of storefront {song.storefront.upper()}. "
                                f"Use storefront {auth_params.storefront.upper()} to get lyrics")
             lyrics = await get_song_lyrics(song.id, auth_params.storefront, auth_params.accountAccessToken,