diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
index 67fdc682..ee76a9a7 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
@@ -92,9 +92,6 @@
             </column>
             <column name="error_message" type="${varchar_type}" />
         </createTable>
-        <createIndex tableName="podcast_episode" indexName="idx_podcast_episode_url">
-            <column name="url"/>
-        </createIndex>
         <rollback>
             <dropTable tableName="podcast_episode" />
         </rollback>
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
index a268ff19..b797459a 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
@@ -207,9 +207,6 @@
         <createIndex tableName="album" indexName="idx_album_present" >
             <column name="present"/>
         </createIndex>
-        <createIndex tableName="album" indexName="idx_album_name">
-            <column name="name"/>
-        </createIndex>
         <sql dbms="hsql">
             set table album type cached
         </sql>
@@ -217,6 +214,16 @@
             <dropTable tableName="album" />
         </rollback>
     </changeSet>
+    <changeSet id="schema47_005" author="muff1nman">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <indexExists indexName="idx_album_name" />
+            </not>
+        </preConditions>
+        <createIndex tableName="album" indexName="idx_album_name">
+            <column name="name"/>
+        </createIndex>
+    </changeSet>
     <changeSet id="schema47_006" author="muff1nman">
         <preConditions onFail="MARK_RAN">
             <not>
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
index ab1e6fc5..1a9f1a23 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
@@ -15,6 +15,16 @@
             </delete>
         </rollback>
     </changeSet>
+    <changeSet id="schema53_002" author="muff1nman">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <indexExists indexName="idx_podcast_episode_url" />
+            </not>
+        </preConditions>
+        <createIndex tableName="podcast_episode" indexName="idx_podcast_episode_url">
+            <column name="url"/>
+        </createIndex>
+    </changeSet>
     <changeSet id="schema53_003" author="muff1nman">
         <preConditions onFail="MARK_RAN">
             <not>