diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index f6abe7b..927a314 100644
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -44,7 +44,8 @@ Future<T>& Future<T>::operator=(Future<T>&& other) noexcept {
 }
 
 template <class T>
-template <class T2>
+template <class T2,
+          typename std::enable_if<!isFuture<T2>::value, void*>::type>
 Future<T>::Future(T2&& val) : core_(nullptr) {
   Promise<T> p;
   p.setValue(std::forward<T2>(val));
diff --git a/folly/futures/Future.h b/folly/futures/Future.h
index cc0bd36..06572c6 100644
--- a/folly/futures/Future.h
+++ b/folly/futures/Future.h
@@ -56,7 +56,9 @@ class Future {
 
   /// Construct a Future from a value (perfect forwarding)
   /* implicit */
-  template <class T2 = T> Future(T2&& val);
+  template <class T2 = T,
+            typename std::enable_if<!isFuture<T2>::value, void*>::type = nullptr>
+  Future(T2&& val);
 
   template <class T2 = T,
             typename std::enable_if<