diff --git a/billing/models/pin_models.py b/billing/models/pin_models.py
index cccb8562..fa4176bb 100644
--- a/billing/models/pin_models.py
+++ b/billing/models/pin_models.py
@@ -51,7 +51,7 @@ class PinCharge(models.Model):
     currency = models.CharField(max_length=3)
     description = models.CharField(max_length=255)
     email = models.EmailField()
-    ip_address = models.IPAddressField()
+    ip_address = models.GenericIPAddressField()
     created_at = models.DateTimeField()
     status_message = models.CharField(max_length=255)
     error_message = models.CharField(max_length=255, null=True, blank=True)
diff --git a/billing/models/world_pay_models.py b/billing/models/world_pay_models.py
index 2c604b6f..cbd4b7b3 100644
--- a/billing/models/world_pay_models.py
+++ b/billing/models/world_pay_models.py
@@ -42,7 +42,7 @@ class WorldPayResponse(models.Model):
     future_pay_id = models.CharField(max_length=64, blank=True)
 
     card_type = models.CharField(max_length=64, blank=True)
-    ip_address = models.IPAddressField(blank=True, null=True)
+    ip_address = models.GenericIPAddressField(blank=True, null=True)
 
     class Meta:
         app_label = __name__.split(".")[0]