diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index ffb1ed70..fbcdede5 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -256,7 +256,6 @@ deviceinfo_attributes = [
     "dtb",
     "modules_initfs",
     "arch",
-    "nonfree",
 
     # device
     "keyboard",
diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py
index 1a1b57eb..a266fca3 100644
--- a/pmb/parse/deviceinfo.py
+++ b/pmb/parse/deviceinfo.py
@@ -31,6 +31,9 @@ def sanity_check(info, path):
                            path + " (if you are sure that you need this, then"
                            " we can probably bring it back to fastboot, just"
                            " let us know in the postmarketOS issues!)")
+    if "nonfree" in info:
+        raise RuntimeError("deviceinfo_nonfree is unused. "
+                           "Please delete it in: " + path)
 
     # "codename" is required
     codename = os.path.basename(os.path.dirname(path))
diff --git a/test/testdata/init_questions_device/aports/device/device-lg-mako/deviceinfo b/test/testdata/init_questions_device/aports/device/device-lg-mako/deviceinfo
index 506c9c5c..3ebeca7a 100644
--- a/test/testdata/init_questions_device/aports/device/device-lg-mako/deviceinfo
+++ b/test/testdata/init_questions_device/aports/device/device-lg-mako/deviceinfo
@@ -5,7 +5,6 @@ deviceinfo_format_version="0"
 deviceinfo_name="Google Nexus 4"
 deviceinfo_manufacturer="LG"
 deviceinfo_date=""
-deviceinfo_nonfree="????"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="false"