diff --git a/atlas/atlascreator.py b/atlas/atlascreator.py
index b1820af..0d7c15b 100644
--- a/atlas/atlascreator.py
+++ b/atlas/atlascreator.py
@@ -69,20 +69,22 @@ def dbwriter(unicodetld, stack, measurement):
         db = Atlas()
         db.unicodetld = unicodetld
         db.stack = stack
-    db.measurement = measurement
+    if measurement is not None:
+        db.measurement = measurement
     db.save()
     tld = TLD.objects.filter(unicodetld=unicodetld)
     if tld.exists():
         primary_key = tld.values_list('pk', flat=True).first()
         db = TLD.objects.get(pk=primary_key)
-        if stack == 4:
-            db.atlasv4 = measurement
-            db.save()
-        elif stack == 6:
-            db.atlasv6 = measurement
-            db.save()
-        else:
-            print("Unknown IP version")
+        if measurement is not None:
+            if stack == 4:
+                db.atlasv4 = measurement
+                db.save()
+            elif stack == 6:
+                db.atlasv6 = measurement
+                db.save()
+            else:
+                print("Unknown IP version")
 
 
 def main():
diff --git a/atlas/models.py b/atlas/models.py
index a1f16be..ae08ffd 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -5,7 +5,7 @@ class Atlas(models.Model):
     STACK = ((0, "Unknown"), (4, "IPv4"), (6, "IPv6"))
     unicodetld = models.CharField(max_length=100)
     stack = models.IntegerField(default=0, choices=STACK)
-    measurement = models.IntegerField(default=0, blank=True, null=True)
+    measurement = models.IntegerField(blank=True, null=True)
     lastEdition = models.DateTimeField(auto_now=True)
 
     def __str__(self):
diff --git a/tldtester/models.py b/tldtester/models.py
index 81eeefd..a0f444f 100644
--- a/tldtester/models.py
+++ b/tldtester/models.py
@@ -39,8 +39,8 @@ class TLD(models.Model):
     organisation = models.CharField(max_length=100)
     rdap = models.CharField(max_length=10, default="No")
     link = models.CharField(max_length=800, default="https://tldtest.net/")
-    atlasv4 = models.IntegerField(default=0, blank=True, null=True)
-    atlasv6 = models.IntegerField(default=0, blank=True, null=True)
+    atlasv4 = models.IntegerField(blank=True, null=True)
+    atlasv6 = models.IntegerField(blank=True, null=True)
 
     def __str__(self):
         return self.tld