diff --git a/include/etl/gcd.h b/include/etl/gcd.h
index b99a9d3a..aea495e5 100644
--- a/include/etl/gcd.h
+++ b/include/etl/gcd.h
@@ -49,6 +49,11 @@ namespace etl
   {
     ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Integral type required");
 
+    if ((a == 0 || b == 0))
+    {
+      return (a + b);
+    }
+
     while (b != 0) 
     {
       T t = b;