diff --git a/controllers/indexerController.go b/controllers/indexerController.go
index 323e48c..76d492b 100644
--- a/controllers/indexerController.go
+++ b/controllers/indexerController.go
@@ -27,7 +27,7 @@ func GetNextToBeIndexed(c *gin.Context) {
 	}
 
 	var addon models.Addon
-	ret := initializers.DB.Where("to_be_indexed = ?", true).Where("priority_indexing = ?", true).Where("current_version_size <= ?", maxSize).Order("updated_at asc").First(&addon)
+	ret := initializers.DB.Where("to_be_indexed = ?", true).Where("is_being_indexed = ?", false).Where("priority_indexing = ?", true).Where("current_version_size <= ?", maxSize).Order("updated_at asc").First(&addon)
 
 	if ret.Error == nil {
 		addon.IsBeingIndexed = true
@@ -43,7 +43,7 @@ func GetNextToBeIndexed(c *gin.Context) {
 		return
 	}
 
-	ret = initializers.DB.Where("to_be_indexed = ?", true).Where("current_version_size <= ?", maxSize).Order("updated_at asc").First(&addon)
+	ret = initializers.DB.Where("to_be_indexed = ?", true).Where("is_being_indexed = ?", false).Where("current_version_size <= ?", maxSize).Order("updated_at asc").First(&addon)
 	if ret.Error != nil && ret.Error != gorm.ErrRecordNotFound {
 		c.JSON(500, gin.H{"error": ret.Error.Error()})
 		return