diff --git a/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx b/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx
index 5840477ac..e700eafb1 100644
--- a/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx
+++ b/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx
@@ -207,7 +207,7 @@ const TorrentGeneralInfo: FC = observer(() => {
               <Trans id="torrents.details.general.comment" />
             </td>
             <td className="torrent-details__detail__value">
-              {torrent.comment ? <LinkedText text={torrent.comment} /> : VALUE_NOT_AVAILABLE}
+              {torrent.comment ? <LinkedText text={torrent.comment.trim()} /> : VALUE_NOT_AVAILABLE}
             </td>
           </tr>
           <tr className="torrent-details__table__heading">
diff --git a/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts b/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts
index da7938f97..be4436f89 100644
--- a/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts
+++ b/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts
@@ -22,7 +22,7 @@ const torrentListMethodCallConfigs = {
     methodCall: 'd.custom2=',
     transformValue: (value: unknown): string => {
       // ruTorrent sets VRS24mrkr as a comment prefix, so we use it as well for compatability
-      if (value === '' || typeof value !== 'string' || value.indexOf('VRS24mrker') !== 0) {
+      if (value === '' || typeof value !== 'string' || !value.startsWith('VRS24mrker')) {
         return '';
       }