diff --git a/modules/juce_core/misc/juce_Functional.h b/modules/juce_core/misc/juce_Functional.h
index 142f5f9d3e..57e9929164 100644
--- a/modules/juce_core/misc/juce_Functional.h
+++ b/modules/juce_core/misc/juce_Functional.h
@@ -36,6 +36,9 @@ namespace detail
     template <typename T>
     struct EqualityComparableToNullptr<T, Void<decltype (std::declval<T>() != nullptr)>>
         : std::true_type {};
+
+    template <typename T>
+    constexpr bool shouldCheckAgainstNullptr = EqualityComparableToNullptr<T>::value;
 } // namespace detail
 #endif
 
@@ -51,15 +54,19 @@ namespace detail
 struct NullCheckedInvocation
 {
     template <typename Callable, typename... Args,
-              std::enable_if_t<detail::EqualityComparableToNullptr<Callable>::value, int> = 0>
+              std::enable_if_t<detail::shouldCheckAgainstNullptr<Callable>, int> = 0>
     static void invoke (Callable&& fn, Args&&... args)
     {
+        JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Waddress")
+
         if (fn != nullptr)
             fn (std::forward<Args> (args)...);
+
+        JUCE_END_IGNORE_WARNINGS_GCC_LIKE
     }
 
     template <typename Callable, typename... Args,
-              std::enable_if_t<! detail::EqualityComparableToNullptr<Callable>::value, int> = 0>
+              std::enable_if_t<! detail::shouldCheckAgainstNullptr<Callable>, int> = 0>
     static void invoke (Callable&& fn, Args&&... args)
     {
         fn (std::forward<Args> (args)...);