diff --git a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.ShortUrl.Entity.ShortUrl.php b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.ShortUrl.Entity.ShortUrl.php
index 2277b0e5..6edd89e5 100644
--- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.ShortUrl.Entity.ShortUrl.php
+++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.ShortUrl.Entity.ShortUrl.php
@@ -28,10 +28,14 @@ return static function (ClassMetadata $metadata, array $emConfig): void {
             ->length(2048)
             ->build();
 
-    fieldWithUtf8Charset($builder->createField('shortCode', Types::STRING), $emConfig, 'bin')
+    $shortCodeField = fieldWithUtf8Charset($builder->createField('shortCode', Types::STRING), $emConfig, 'bin')
             ->columnName('short_code')
-            ->length(255)
-            ->build();
+            ->length(255);
+    if (($emConfig['connection']['driver'] ?? null) === 'pdo_sqlsrv') {
+        // Make sure a case-sensitive charset is set in short code for Microsoft SQL Server
+        $shortCodeField->option('collation', 'Latin1_General_CS_AS');
+    }
+    $shortCodeField->build();
 
     $builder->createField('dateCreated', ChronosDateTimeType::CHRONOS_DATETIME)
             ->columnName('date_created')
diff --git a/module/Core/migrations/Version20240220214031.php b/module/Core/migrations/Version20240220214031.php
index adceb7f2..3af587ef 100644
--- a/module/Core/migrations/Version20240220214031.php
+++ b/module/Core/migrations/Version20240220214031.php
@@ -20,7 +20,6 @@ final class Version20240220214031 extends AbstractMigration
     private const DOMAINS_COLUMNS = ['base_url_redirect', 'regular_not_found_redirect', 'invalid_short_url_redirect'];
     private const TEXT_COLUMNS = [
         'domains' => self::DOMAINS_COLUMNS,
-        'device_long_urls' => ['long_url'],
         'short_urls' => ['original_url'],
     ];