diff --git a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java b/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
index babb929..7e3adc0 100644
--- a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
+++ b/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
@@ -95,10 +95,13 @@ public List<Object[]> importUsers() {
 
   public int exportUsers(List<Object[]> data) {
     this.importUsers();
-    
+
     if (data == null) {
       throw new IllegalArgumentException("data can't be null");
     }
+    if (data.isEmpty()) {
+      return 0;
+    }
     if (data.get(0).length != 6) {
       throw new IllegalArgumentException("data's arrays must have a length of 6");
     }
@@ -184,10 +187,13 @@ private List<Object[]> importDonations(int user_id, boolean all) {
 
   public int exportDonations(List<Object[]> data) {
     this.fetchAllDonations();
-    
+
     if (data == null) {
       throw new IllegalArgumentException("data can't be null");
     }
+    if (data.isEmpty()) {
+      return 0;
+    }
     if (data.get(0).length != 6) {
       throw new IllegalArgumentException("data's arrays must have a length of 6");
     }
diff --git a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java b/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
index f31d57c..8c401c4 100644
--- a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
+++ b/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
@@ -196,4 +196,12 @@ public void addingDonationListWithNullInRowThrowsExpectedException() {
     assertTrue(this.db.disconnect());
     assertEquals("One or more rows in data contains null values", exception.getMessage());
   }
+
+  @Test
+  public void dataIsEmptyAfterExportingAndImportingEmptyList() {
+    assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
+    assertEquals(0, this.db.exportDonations(new ArrayList<Object[]>()));
+    assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
+    assertTrue(this.db.disconnect());
+  }
 }