diff --git a/CHANGELOG.md b/CHANGELOG.md
index f12aa90eb..6a4f8fb96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - PUS Health Service: Size check for set health command.
 - PUS Health Service: Perform operation completion for announce health command.
 
+## Changed
+
+- Assert that `FixedArrayList` is larger than 0 at compile time.
+
 # [v6.0.0] 2023-02-10
 
 ## Fixes
diff --git a/src/fsfw/container/FixedArrayList.h b/src/fsfw/container/FixedArrayList.h
index 97ade7e8f..dde8eb16f 100644
--- a/src/fsfw/container/FixedArrayList.h
+++ b/src/fsfw/container/FixedArrayList.h
@@ -12,6 +12,7 @@ template <typename T, size_t MAX_SIZE, typename count_t = uint8_t>
 class FixedArrayList : public ArrayList<T, count_t> {
   static_assert(MAX_SIZE <= std::numeric_limits<count_t>::max(),
                 "count_t is not large enough to hold MAX_SIZE");
+  static_assert(MAX_SIZE > 0, "MAX_SIZE is 0");
 
  private:
   T data[MAX_SIZE];