diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5232c5140..3f1bb924f 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -512,11 +512,13 @@ Shadows* RenderingManager::getShadows()
 void RenderingManager::switchToInterior()
 {
     mObjects.setInterior(true);
+    mRendering.getScene()->setCameraRelativeRendering(false);
 }
 
 void RenderingManager::switchToExterior()
 {
     mObjects.setInterior(false);
+    mRendering.getScene()->setCameraRelativeRendering(true);
 }
 
 } // namespace
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 445677808..c81f23f54 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -176,7 +176,12 @@ void Water::toggle()
 
 void Water::checkUnderwater(float y)
 {
-    if (!mActive) return;
+    if (!mActive)
+    {
+        CompositorManager::getSingleton().setCompositorEnabled(mViewport, mCompositorName, false);
+        return;
+    }
+
     if ((mIsUnderwater && y > mTop) || !mWater->isVisible() || mCamera->getPolygonMode() != Ogre::PM_SOLID)
     {
         CompositorManager::getSingleton().setCompositorEnabled(mViewport, mCompositorName, false);