diff --git a/tensorflow/core/kernels/sparse_fill_empty_rows_op.cc b/tensorflow/core/kernels/sparse_fill_empty_rows_op.cc
index 542069ccd88..99f5d25016c 100644
--- a/tensorflow/core/kernels/sparse_fill_empty_rows_op.cc
+++ b/tensorflow/core/kernels/sparse_fill_empty_rows_op.cc
@@ -69,7 +69,10 @@ class SparseFillEmptyRowsOp : public OpKernel {
                                         default_value_t.shape().DebugString()));
     // TODO(ebrevdo): add shape checks between values, indices,
     // dense_shape.  Also add check that dense rank > 0.
-
+    // Also add check that dense rank > 0.
+    OP_REQUIRES(context, dense_shape_t.NumElements() != 0,
+                errors::InvalidArgument("Dense shape cannot be empty."),
+                done);
     const T& default_value = default_value_t.scalar<T>()();
     const auto indices = indices_t.matrix<int64>();
     const auto values = values_t.vec<T>();