diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
index b63a39e8c7..f1de8dc0d1 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import org.springframework.security.core.Authentication;
  * annotations.
  *
  * @author Luke Taylor
+ * @author Alexander Furer
  * @since 3.0
  */
 public class PostInvocationAdviceProvider implements AfterInvocationProvider {
@@ -73,7 +74,7 @@ public class PostInvocationAdviceProvider implements AfterInvocationProvider {
 
 	@Override
 	public boolean supports(Class<?> clazz) {
-		return clazz.isAssignableFrom(MethodInvocation.class);
+		return MethodInvocation.class.isAssignableFrom(clazz);
 	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java b/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java
new file mode 100644
index 0000000000..2502890e08
--- /dev/null
+++ b/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.security.access.prepost;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.aop.ProxyMethodInvocation;
+import org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+public class PostInvocationAdviceProviderTest {
+
+	@Mock
+	private PostInvocationAuthorizationAdvice authorizationAdvice;
+
+	private PostInvocationAdviceProvider postInvocationAdviceProvider;
+
+	@BeforeEach
+	public void setUp() {
+		this.postInvocationAdviceProvider = new PostInvocationAdviceProvider(this.authorizationAdvice);
+	}
+
+	@Test
+	public void supportsMethodInvocation() {
+		assertThat(this.postInvocationAdviceProvider.supports(MethodInvocation.class)).isTrue();
+	}
+
+	@Test
+	public void supportsProxyMethodInvocation() {
+		assertThat(this.postInvocationAdviceProvider.supports(ProxyMethodInvocation.class)).isTrue();
+	}
+
+	@Test
+	public void supportsMethodInvocationAdapter() {
+		assertThat(this.postInvocationAdviceProvider.supports(MethodInvocationAdapter.class)).isTrue();
+	}
+
+}