diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java b/impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java
index 743cc231b14..6ab167e445b 100644
--- a/impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java
+++ b/impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java
@@ -85,10 +85,10 @@ public T getInstance() {
 
         WeldCreationalContext<T> creationalContext;
         WeldCreationalContext<?> previousCreationalContext = currentCreationalContext.get();
-        if (currentCreationalContext.get() == null) {
+        if (previousCreationalContext == null) {
             creationalContext = new CreationalContextImpl<T>(bean);
         } else {
-            creationalContext = currentCreationalContext.get().getCreationalContext(bean);
+            creationalContext = previousCreationalContext.getCreationalContext(bean);
         }
         final CurrentInjectionPoint currentInjectionPoint = container.services().get(CurrentInjectionPoint.class);
         currentCreationalContext.set(creationalContext);