diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 95871559adf6208aa4d6da4c53c62f20dfbbd5e7..69716c4123f19252f159d45d1fffec5bf4e20e2b 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -97,7 +97,7 @@ public:
         const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
         const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
         const auto& insideVolVars = elemVolVars[insideScv];
-        const auto& outsideVolVars = scvf.boundary() ?  insideVolVars : elemVolVars[scvf.outsideScvIdx()];
+        const auto& outsideVolVars = elemVolVars[scvf.outsideScvIdx()];
 
         // effective conductivity tensors
         auto insideLambda = insideVolVars.thermalConductivity();
diff --git a/test/freeflow/staggeredni/test_diffusion_ni.input b/test/freeflow/staggeredni/test_diffusion_ni.input
index 3fc13d39c4e1718c0eb8603d30e7c5c81ff89765..46ba61fd961df98e6c64ebe1790b834f075d8da2 100644
--- a/test/freeflow/staggeredni/test_diffusion_ni.input
+++ b/test/freeflow/staggeredni/test_diffusion_ni.input
@@ -1,14 +1,13 @@
 [TimeManager]
-DtInitial = 5e-3 # [s]
-TEnd = 1e-2 # [s]
+DtInitial = 1e-0 # [s]
+TEnd = 1.2e6 # [s]
 
 [Grid]
-UpperRight = 5 1
-Cells = 50 25
+UpperRight = 5 5
+Cells =  15 15
 
 [Problem]
 Name = test_diffusion_ni # name passed to the output routines
-InletVelocity = 5 #1000
 InletTemp = 293.15
 EnableGravity = false