diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index b56ed118f..c45fe9b1c 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -26,7 +26,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index f8e4dc40a..8dd8bb6d6 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -31,7 +31,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 40ba21733..05a0085f3 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -24,7 +24,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index df05a7910..884b27aed 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -28,7 +28,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 8180cb686..db715813d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -62,7 +62,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 381ffa233..ebf2e4bf9 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -30,7 +30,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 2cc607f5f..6ec11b457 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -37,7 +37,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 904931ab8..8d9eeae2d 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -33,7 +33,7 @@ namespace MWClass
         const std::string &model = ref->mBase->mModel;
 
         MWRender::Objects& objects = renderingInterface.getObjects();
-        objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+        objects.insertBegin(ptr);
         if(!model.empty())
             objects.insertMesh(ptr, "meshes\\" + model);
         else
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 084490742..6cca2000c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -27,7 +27,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 6b384be99..65d1fda56 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -43,7 +43,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index c2d2920d0..87b40ec4b 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -29,7 +29,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 6b7e43230..1e5c43092 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -27,7 +27,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index e2993029b..1d3116daa 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -26,7 +26,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 026eada7b..ada473676 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -16,7 +16,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), true);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index db07fb553..74ed6a8e3 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -34,7 +34,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
+            objects.insertBegin(ptr);
             objects.insertMesh(ptr, model);
         }
     }
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index cac19a9ee..2baadbed0 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -979,7 +979,7 @@ void Animation::detachObjectFromBone(Ogre::MovableObject *obj)
 }
 
 
-ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model, bool isStatic)
+ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model)
   : Animation(ptr, ptr.getRefData().getBaseNode())
 {
     setObjectRoot(model, false);
@@ -997,7 +997,8 @@ ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &mod
         small = false;
 
     float dist = small ? Settings::Manager::getInt("small object distance", "Viewing distance") : 0.0f;
-    setRenderProperties(mObjectRoot, isStatic ? (small ? RV_StaticsSmall : RV_Statics) : RV_Misc,
+    setRenderProperties(mObjectRoot, (mPtr.getTypeName() == typeid(ESM::Static).name()) ?
+                                     (small ? RV_StaticsSmall : RV_Statics) : RV_Misc,
                         RQG_Main, RQG_Alpha, dist);
 }
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 74e3c503f..b0e4f6dbd 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -247,7 +247,7 @@ public:
 
 class ObjectAnimation : public Animation {
 public:
-    ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model, bool isStatic);
+    ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model);
 
     void addLight(const ESM::Light *light);
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 6cf40300a..6563238d0 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -29,7 +29,7 @@ void Objects::setRootNode(Ogre::SceneNode* root)
     mRootNode = root;
 }
 
-void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_)
+void Objects::insertBegin (const MWWorld::Ptr& ptr)
 {
     Ogre::SceneNode* root = mRootNode;
     Ogre::SceneNode* cellnode;
@@ -66,10 +66,7 @@ void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_)
     // Rotates first around z, then y, then x
     insert->setOrientation(xr*yr*zr);
 
-    if (!enabled)
-         insert->setVisible (false);
     ptr.getRefData().setBaseNode(insert);
-    mIsStatic = static_;
 }
 
 void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
@@ -77,7 +74,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
     Ogre::SceneNode* insert = ptr.getRefData().getBaseNode();
     assert(insert);
 
-    std::auto_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh, mIsStatic));
+    std::auto_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh));
 
     Ogre::AxisAlignedBox bounds = anim->getWorldBounds();
     Ogre::Vector3 extents = bounds.getSize();
@@ -97,7 +94,9 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
     if(ptr.getTypeName() == typeid(ESM::Light).name())
         anim->addLight(ptr.get<ESM::Light>()->mBase);
 
-    if(mIsStatic && Settings::Manager::getBool("use static geometry", "Objects") && anim->canBatch())
+    if(ptr.getTypeName() == typeid(ESM::Static).name() &&
+       Settings::Manager::getBool("use static geometry", "Objects") &&
+       anim->canBatch())
     {
         Ogre::StaticGeometry* sg = 0;
 
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 949486732..815233a66 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -28,17 +28,16 @@ class Objects{
     PtrAnimationMap mObjects;
 
     Ogre::SceneNode* mRootNode;
-    bool mIsStatic;
+
     static int uniqueID;
 
 public:
     Objects(OEngine::Render::OgreRenderer &renderer)
         : mRenderer(renderer)
-        , mIsStatic(false)
         , mRootNode(NULL)
     {}
     ~Objects(){}
-    void insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_);
+    void insertBegin (const MWWorld::Ptr& ptr);
     void insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh);
 
     void enableLights();