diff --git a/Dockerfiles/python/scripts/main.py b/Dockerfiles/python/scripts/main.py
index aefbbe0821a29f5ec9414329ae88b695f45bb4d4..329f6e47345abbc2cb7f6e9b27ee5cd3d4f66642 100644
--- a/Dockerfiles/python/scripts/main.py
+++ b/Dockerfiles/python/scripts/main.py
@@ -836,7 +836,7 @@ def computeIndices():
     conn, cur = connectDB(DB_params)
 
     # Get TILES_FACTORS count
-    tfCount = getCountfromDB(DB_params, DB_schema, 'tiles_factors', None, conn, cur)
+    tfCount = getCountfromDB(DB_params, DB_schema, 'tiles_factors', 'id < 100', conn, cur)
 
     # Check empty data for TILES_FACTORS table
     if tfCount == 0:
@@ -844,7 +844,7 @@ def computeIndices():
         return_error_and_exit_job(-3)
 
     # Get TILES count
-    tCount = getCountfromDB(DB_params, DB_schema, 'tiles', None, conn, cur)
+    tCount = getCountfromDB(DB_params, DB_schema, 'tiles', 'id < 100', conn, cur)
 
     # Check empty data for TILES table
     if tCount == 0:
diff --git a/Dockerfiles/python/scripts/utils.py b/Dockerfiles/python/scripts/utils.py
index 8c7dc49585bfcb61683e6a48bca16bf864e184fb..3363cc8324656071c55f3d6c4791c0d279da2863 100644
--- a/Dockerfiles/python/scripts/utils.py
+++ b/Dockerfiles/python/scripts/utils.py
@@ -247,7 +247,7 @@ def getCountfromDB(DB_params, DB_schema, tableName, queryFilter=None, connInput
         cur = curInput
     
     # Build request
-    countQuery = "SELECT COUNT(*) FROM " + DB_schema + "." + tableName
+    countQuery = "SELECT COUNT(1) FROM " + DB_schema + "." + tableName
 
     if queryFilter:
         countQuery = countQuery + " WHERE " + queryFilter