diff --git a/.gitignore b/.gitignore
index eb1eccbef..ea2ce9512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,8 @@ yarn-error.log*
 /netbox/netbox/configuration.py
 /netbox/netbox/ldap_config.py
 /netbox/local/*
-/netbox/media
+/netbox/media/*
+!/netbox/media/.gitkeep
 /netbox/reports/*
 !/netbox/reports/__init__.py
 /netbox/scripts/*
diff --git a/netbox/media/.gitkeep b/netbox/media/.gitkeep
new file mode 100644
index 000000000..e69de29bb