diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
index 23359a93..ee1eef1b 100644
--- a/skimage/transform/_geometric.py
+++ b/skimage/transform/_geometric.py
@@ -1052,15 +1052,17 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
         out = ndimage.map_coordinates(image, coords, prefilter=prefilter,
                                       mode=mode, order=order, cval=cval)
 
-    # The spline filters sometimes return results outside [0, 1],
-    # so clip to ensure valid data
-    clipped = np.clip(out, 0, 1)
+        # The spline filters sometimes return results outside [0, 1],
+        # so clip to ensure valid data
+        clipped = np.clip(out, 0, 1)
 
-    if mode == 'constant' and not (0 <= cval <= 1):
-        clipped[out == cval] = cval
+        if mode == 'constant' and not (0 <= cval <= 1):
+            clipped[out == cval] = cval
 
-    if clipped.ndim == 3 and orig_ndim == 2:
-        # remove singleton dim introduced by atleast_3d
-        return clipped[..., 0]
+        out = clipped
+
+    if out.ndim == 3 and orig_ndim == 2:
+        # remove singleton dimension introduced by atleast_3d
+        return out[..., 0]
     else:
-        return clipped
+        return out