diff --git a/elx-common/src/main/java/org/xbib/elx/common/AbstractAdminClient.java b/elx-common/src/main/java/org/xbib/elx/common/AbstractAdminClient.java
index d00f6ff..0252982 100644
--- a/elx-common/src/main/java/org/xbib/elx/common/AbstractAdminClient.java
+++ b/elx-common/src/main/java/org/xbib/elx/common/AbstractAdminClient.java
@@ -352,9 +352,11 @@ public abstract class AbstractAdminClient extends AbstractBasicClient implements
         }
         if (indexDefinition.isShiftEnabled()) {
             if (indexDefinition.isShiftNotEmpty() && isIndexEmpty(indexDefinition)) {
-                logger.log(Level.WARNING, "index is empty, deleting index and rejecting to continue shifting: " +
+                logger.log(Level.WARNING, "index is empty, deleting index, disabling definition, rejecting to continue shifting: " +
                         indexDefinition);
                 deleteIndex(indexDefinition);
+                indexDefinition.setEnabled(false);
+                indexDefinition.setPrune(false);
                 return new EmptyIndexShiftResult();
             }
             if (indexDefinition.isCloseShifted()) {
diff --git a/gradle.properties b/gradle.properties
index 32fa9c9..caa995d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 group = org.xbib
 name = elx
-version = 7.10.2.46
+version = 7.10.2.47