diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 6101358de1..f8453afed6 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -396,6 +396,8 @@ namespace MWBase
             /// It only applies to the current form the NPC is in.
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
 
+            virtual bool getGodModeState() = 0;
+
             virtual bool toggleGodMode() = 0;
     };
 }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f5caff3591..1e41eb7409 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -275,9 +275,7 @@ namespace MWMechanics
                         continue;
                 }
 
-                // workaround: always keep player alive for now
-                // \todo remove workaround, once player death can be handled
-                if(iter->first.getRefData().getHandle()=="player" && false)
+                if(iter->first.getRefData().getHandle()=="player" && MWBase::Environment::get().getWorld()->getGodModeState())
                 {
                     MWMechanics::DynamicStat<float> stat(stats.getHealth());
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2b4b5d2254..d262747b90 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1948,12 +1948,14 @@ namespace MWWorld
         stats.getSkill(ESM::Skill::Acrobatics).setModified(gmst.find("fWerewolfAcrobatics")->getFloat(), 0);
     }
 
+    bool World::getGodModeState()
+    {
+        return mGodMode;
+    }
+
     bool World::toggleGodMode()
     {
-        if (mGodMode)
-            mGodMode = false;
-        else
-            mGodMode = true;
+        mGodMode ? mGodMode = false : mGodMode = true;
 
         return mGodMode;
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 5e6fe50f9e..53b01f1abf 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -442,6 +442,8 @@ namespace MWWorld
 
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor);
 
+            virtual bool getGodModeState();
+
             virtual bool toggleGodMode();
     };
 }