diff --git a/CHANGELOG.md b/CHANGELOG.md
index e10745c..3703c41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.12.4
+
+* Be even more careful not to produce features with empty geometry
+
 ## 1.12.3
 
 * Fix double-counted progress in the progress indicator
diff --git a/tile.cpp b/tile.cpp
index 9e8da6e..580a647 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -1010,6 +1010,10 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
 					features[k][x].geom = remove_noop(features[k][x].geom, features[k][x].type, 0);
 				}
 
+				if (features[k][x].geom.size() == 0) {
+					continue;
+				}
+
 				feature.type = features[k][x].type;
 				feature.geometry = to_feature(features[k][x].geom);
 				count += features[k][x].geom.size();
diff --git a/version.hpp b/version.hpp
index ca8a33b..efe6062 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1 +1 @@
-#define VERSION "tippecanoe v1.12.3\n"
+#define VERSION "tippecanoe v1.12.4\n"