diff --git a/include/etl/span.h b/include/etl/span.h
index acf76f1d..c924ddc9 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -272,7 +272,7 @@ namespace etl
     //*************************************************************************
     ETL_NODISCARD ETL_CONSTEXPR bool empty() const ETL_NOEXCEPT
     {
-      return false;
+      return Extent == 0;
     }
 
     //*************************************************************************
diff --git a/test/test_span_fixed_extent.cpp b/test/test_span_fixed_extent.cpp
index 33e8a6f5..bef80172 100644
--- a/test/test_span_fixed_extent.cpp
+++ b/test/test_span_fixed_extent.cpp
@@ -52,6 +52,7 @@ namespace
     typedef etl::span<int, 10U> View;
     typedef etl::span<int, 9U> SView;
     typedef etl::span<const int, 10U> CView;
+    typedef etl::span<int, 0U> EView;
 
 #if ETL_USING_CPP20
     using StdView = std::span<int, 10U>;
@@ -484,6 +485,9 @@ namespace
     {
       View view1(etldata.begin(), etldata.begin());
       CHECK(!view1.empty());
+
+      EView view2(etldata.begin(), etldata.begin());
+      CHECK(view2.empty());
     }
 
     //*************************************************************************