diff --git a/include/gsl/pointers b/include/gsl/pointers
index 5e69f58..2a032ab 100644
--- a/include/gsl/pointers
+++ b/include/gsl/pointers
@@ -231,7 +231,7 @@ template <class T>
 not_null<T> operator+(std::ptrdiff_t, const not_null<T>&) = delete;
 
 
-template <class T, class U = decltype(std::declval<const T&>().get()), bool = std::is_default_constructible<std::hash<U>>::value>
+template <class T, class U = typename T::element_type, bool = std::is_default_constructible<std::hash<U>>::value>
 struct not_null_hash
 {
     std::size_t operator()(const T& value) const { return std::hash<U>{}(value.get()); }
diff --git a/tests/notnull_tests.cpp b/tests/notnull_tests.cpp
index 56b549b..4fa48b0 100644
--- a/tests/notnull_tests.cpp
+++ b/tests/notnull_tests.cpp
@@ -735,4 +735,18 @@ TEST(notnull_tests, TestStdHash)
         EXPECT_FALSE(hash_nn(nn) == hash_intptr(&y));
         EXPECT_FALSE(hash_nn(nn) == hash_intptr(nullptr));
     }
+
+    {
+        auto x = std::make_shared<int>(42);
+        auto y = std::make_shared<int>(99);
+        not_null<std::shared_ptr<int>> nn{x};
+        const not_null<std::shared_ptr<int>> cnn{x};
+
+        std::hash<not_null<std::shared_ptr<int>>> hash_nn;
+        std::hash<std::shared_ptr<int>> hash_sharedptr;
+
+        EXPECT_TRUE(hash_nn(nn) == hash_sharedptr(x));
+        EXPECT_FALSE(hash_nn(nn) == hash_sharedptr(y));
+        EXPECT_TRUE(hash_nn(cnn) == hash_sharedptr(x));
+    }
 }