diff --git a/nextcloud/root/etc/cont-init.d/51-elasticsearch b/nextcloud/root/etc/cont-init.d/51-elasticsearch
index 73d5c202f..72bd3784c 100644
--- a/nextcloud/root/etc/cont-init.d/51-elasticsearch
+++ b/nextcloud/root/etc/cont-init.d/51-elasticsearch
@@ -19,9 +19,12 @@ fi
 # SwITNet Ltd © - 2021, https://switnet.net/                                    #
 #################################################################################
 
-if bashio::config.true 'Full_Text_Search' && [ $LAUNCHER fulltextsearch:index &>/dev/null ] ; then
-    echo "Full Text Search is already working"
-else
+if bashio::config.true 'Full_Text_Search'; then
+    if [ $LAUNCHER fulltextsearch:index &>/dev/null ] ; then
+        echo "Full Text Search is already working"
+        break 2
+    fi
+
     echo "Installing Full Text Search"
     # Reset Full Text Search to be able to index again, and also remove the app to be able to install it again
     occ fulltextsearch:reset &>/dev/null || true