diff --git a/skimage/exposure/exposure.py b/skimage/exposure/exposure.py
index 8d047837..a0a576d6 100644
--- a/skimage/exposure/exposure.py
+++ b/skimage/exposure/exposure.py
@@ -174,12 +174,11 @@ def rescale_intensity(image, in_range=None, out_range=None):
 
     if out_range is None:
         omin, omax = dtype_range[dtype]
+        if imin >= 0:
+            omin = 0
     else:
         omin, omax = out_range
 
-    if imin >= 0:
-        omin = 0
-
     image = np.clip(image, imin, imax)
 
     image = (image - imin) / float(imax - imin)