diff --git a/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java b/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
index ed1202db567b68083e9c5b5a5304e22bf55f041b..3405b7fd2057cfb2a6b206527f03b00a9c166258 100644
--- a/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
+++ b/fda-table-service/services/src/main/java/at/tuwien/service/impl/MariaDataService.java
@@ -173,17 +173,11 @@ public class MariaDataService extends JdbcConnector implements DataService {
     @Override
     @Transactional
     public QueryResultDto selectAll(@NonNull Long databaseId, @NonNull Long tableId, Instant timestamp,
-                                    Long page, Long size) throws TableNotFoundException,
+                                    @NonNull Long page, @NonNull Long size) throws TableNotFoundException,
             DatabaseNotFoundException, ImageNotSupportedException, DatabaseConnectionException, TableMalformedException {
         if(timestamp == null) {
             timestamp = Instant.now();
         }
-        if(page == null ) {
-            page = 0L;
-        }
-        if(size == null) {
-            size = 100L;
-        }
         if (page < 0) {
             throw new TableMalformedException("Page number cannot be lower than 0");
         }