diff --git a/src/object/object_manager.cpp b/src/object/object_manager.cpp
index fd335014..bab1f3ac 100644
--- a/src/object/object_manager.cpp
+++ b/src/object/object_manager.cpp
@@ -142,6 +142,8 @@ CObject* CObjectManager::CreateObject(ObjectCreateParams params)
         }
     }
 
+    params.power = ClampPower(params.type,params.power);
+
     assert(m_objects.find(params.id) == m_objects.end());
 
     auto objectUPtr = m_objectFactory->CreateObject(params);
@@ -163,10 +165,20 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
     params.angle = angle;
     params.type = type;
     params.power = power;
-
     return CreateObject(params);
 }
 
+float CObjectManager::ClampPower(ObjectType type, float power)
+{
+    float min = 0;
+    float max = 100;
+    if (type == OBJECT_POWER || type == OBJECT_ATOMIC)
+    {
+        max = 1;
+    }
+    return Math::Clamp(power, min, max);
+}
+
 std::vector<CObject*> CObjectManager::GetObjectsOfTeam(int team)
 {
     std::vector<CObject*> result;
diff --git a/src/object/object_manager.h b/src/object/object_manager.h
index b5296156..3ae55c84 100644
--- a/src/object/object_manager.h
+++ b/src/object/object_manager.h
@@ -303,6 +303,8 @@ public:
     //@}
 
 private:
+    //! Prevents creation of overcharged power cells
+    float ClampPower(ObjectType type, float power);
     void CleanRemovedObjectsIfNeeded();
 
 private: