diff --git a/CHANGELOG.md b/CHANGELOG.md
index e54854c..6ac6716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Added support for `ElectricCurrent * Resistance`
 - Added support for `Power * Time`
 - Added support for `Energy / Time`
+- Fixed dividing a unit by `NoUnit` resulting in `NoUnit`
 - Fixed interpreting of `µs`
 - Fixed panics caused in Rust `1.48.0` by specifying `decimal` as a git dependency.
 
diff --git a/Cargo.lock b/Cargo.lock
index 18587c7..f155146 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
 
 [[package]]
 name = "cpc"
-version = "1.1.0"
+version = "1.2.0"
 dependencies = [
  "decimal",
 ]
diff --git a/src/units.rs b/src/units.rs
index 253fd05..71e7c28 100644
--- a/src/units.rs
+++ b/src/units.rs
@@ -577,7 +577,7 @@ pub fn divide(left: Number, right: Number) -> Result<Number, String> {
     Err(format!("Cannot divide {:?} by {:?}", left.unit, right.unit))
   } else if left.unit != NoUnit && right.unit == NoUnit {
     // 1 km / 2
-    Ok(Number::new(left.value / right.value, right.unit))
+    Ok(Number::new(left.value / right.value, left.unit))
   } else if lcat == rcat {
     // 4 km / 2 km
     let (left, right) = convert_to_lowest(left, right)?;