diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
index ac2c9f665a8e312826299d33819aebe80bc938ed..06eb9420018248a3d99a298fe9238cff4fc22d6d 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
@@ -29,7 +29,7 @@ namespace armarx::skills::segment
     ComposedSkillLibraryCoreSegment::defineProperties(PropertyDefinitionsPtr defs,
                                                       const std::string& prefix)
     {
-        this->setDefaultMaxHistorySize(3);
+        this->setDefaultMaxHistorySize(maxHistorySize);
         Base::defineProperties(defs, prefix);
     }
 
diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.h b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.h
index afb8fa9d5705dc4f9fc298fdbf1a5a345097f621..d6e86fc46a03141d0d13ebe4c716e5622055e3ee 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.h
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.h
@@ -33,5 +33,8 @@ namespace armarx::skills::segment
 
         std::optional<std::vector<skills::manager::arondto::FluxioSkill>> getSkills() const;
         std::optional<std::vector<skills::manager::arondto::FluxioSkill>> getSkillsOfProvider(const std::string& providerId) const;
+
+    private:
+        static const int maxHistorySize = 7;
     };
 } // namespace armarx::skills::segment