diff --git a/infer/src/backend/tabulation.ml b/infer/src/backend/tabulation.ml
index d3f16196b..3fc110e97 100644
--- a/infer/src/backend/tabulation.ml
+++ b/infer/src/backend/tabulation.ml
@@ -1064,27 +1064,53 @@ let check_uninitialize_dangling_deref caller_pname tenv callee_pname actual_pre
     props
 
 
-let add_missing_field_to_tenv tenv callee_pname hpreds =
-  match Ondemand.get_proc_desc callee_pname with
-  | Some pdesc ->
-      let attrs = Procdesc.get_attributes pdesc in
-      let source_file = attrs.ProcAttributes.loc.Location.file in
-      let callee_tenv_opt = Tenv.load source_file in
-      let add_field_in_hpred hpred =
-        match (callee_tenv_opt, hpred) with
-        | ( Some callee_tenv
-          , Sil.Hpointsto (_, Sil.Estruct (_, _), Exp.Sizeof {typ= {desc= Typ.Tstruct name}}) ) -> (
-          match Tenv.lookup callee_tenv name with
-          | Some {fields} ->
-              List.iter ~f:(fun field -> Tenv.add_field tenv name field) fields
-          | None ->
-              () )
-        | _ ->
-            ()
-      in
-      List.iter ~f:add_field_in_hpred hpreds
-  | None ->
-      ()
+let missing_sigma_need_adding_to_tenv tenv hpreds =
+  let field_is_missing struc (field, _) =
+    not
+      (List.exists struc.Typ.Struct.fields ~f:(fun (fname, _, _) -> Typ.Fieldname.equal fname field))
+  in
+  let missing_hpred_need_adding_to_tenv hpred =
+    match hpred with
+    | Sil.Hpointsto (_, Sil.Estruct (missing_fields, _), Exp.Sizeof {typ= {desc= Typ.Tstruct name}})
+          -> (
+      match Tenv.lookup tenv name with
+      | Some struc ->
+          List.exists ~f:(field_is_missing struc) missing_fields
+      | _ ->
+          false )
+    | _ ->
+        false
+  in
+  List.exists hpreds ~f:missing_hpred_need_adding_to_tenv
+
+
+let add_missing_field_to_tenv ~missing_sigma caller_tenv callee_pname hpreds =
+  (* if hpreds are missing_sigma, we may not need to add the fields to the tenv, so we check that first *)
+  let add_fields =
+    if missing_sigma then missing_sigma_need_adding_to_tenv caller_tenv hpreds else true
+  in
+  if add_fields then
+    match Ondemand.get_proc_desc callee_pname with
+    | Some pdesc ->
+        let attrs = Procdesc.get_attributes pdesc in
+        let source_file = attrs.ProcAttributes.loc.Location.file in
+        let callee_tenv_opt = Tenv.load source_file in
+        let add_field_in_hpred hpred =
+          match (callee_tenv_opt, hpred) with
+          | ( Some callee_tenv
+            , Sil.Hpointsto (_, Sil.Estruct (_, _), Exp.Sizeof {typ= {desc= Typ.Tstruct name}}) )
+                -> (
+            match Tenv.lookup callee_tenv name with
+            | Some {fields} ->
+                List.iter ~f:(fun field -> Tenv.add_field caller_tenv name field) fields
+            | None ->
+                () )
+          | _ ->
+              ()
+        in
+        List.iter ~f:add_field_in_hpred hpreds
+    | None ->
+        ()
 
 
 (** Perform symbolic execution for a single spec *)
@@ -1182,9 +1208,16 @@ let exe_spec tenv ret_id_opt (n, nspecs) caller_pdesc callee_pname loc prop path
           let missing_fld_objc_class, missing_fld_not_objc_class =
             List.partition_tf ~f:(fun hp -> hpred_missing_objc_class hp) missing_fld
           in
+          let missing_sigma_objc_class =
+            List.filter ~f:(fun hp -> hpred_missing_objc_class hp) missing_sigma
+          in
           if missing_fld_objc_class <> [] then (
             L.d_strln "Objective-C missing_fld not empty: adding it to current tenv..." ;
-            add_missing_field_to_tenv tenv callee_pname missing_fld_objc_class ) ;
+            add_missing_field_to_tenv ~missing_sigma:false tenv callee_pname missing_fld_objc_class ) ;
+          if missing_sigma_objc_class <> [] then (
+            L.d_strln "Objective-C missing_sigma not empty: adding it to current tenv..." ;
+            add_missing_field_to_tenv ~missing_sigma:true tenv callee_pname
+              missing_sigma_objc_class ) ;
           if not !Config.footprint && split.missing_sigma <> [] then (
             L.d_strln "Implication error: missing_sigma not empty in re-execution" ;
             Invalid_res Missing_sigma_not_empty )
diff --git a/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.h b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.h
new file mode 100644
index 000000000..374fe6a7e
--- /dev/null
+++ b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2018 - present Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#import <Foundation/NSObject.h>
+
+@interface ListAdapter
+
+@property(nonatomic, nullable, weak) id dataSource;
+@property(nonatomic, nullable, strong) id dataSourceStrong;
+
+@end
diff --git a/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.m b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.m
new file mode 100644
index 000000000..2fb68dff7
--- /dev/null
+++ b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/ListAdapter.m
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2018 - present Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#import "ListAdapter.h"
+
+@implementation ListAdapter
+
+- (void)setDataSource:(id)dataSource {
+  _dataSource = dataSource;
+}
+
+- (void)setDataSourceStrong:(id)dataSourceStrong {
+  _dataSourceStrong = dataSourceStrong;
+}
+
+@end
diff --git a/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m
index 51647d3ad..e0656a188 100644
--- a/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m
+++ b/infer/tests/build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m
@@ -8,18 +8,36 @@
  */
 #import "TimeSpent.h"
 #import "AnalyticsTimeSpent.h"
+#import "ListAdapter.h"
 
 @interface TimeSpent () {
   AnalyticsTimeSpent* _timeSpent;
 }
 @end
 
-@implementation TimeSpent
+@implementation TimeSpent {
+  ListAdapter* _listAdapter;
+}
+
 - (instancetype)init {
   _timeSpent = [[AnalyticsTimeSpent alloc] initWithDelegate:self];
   return self;
 }
 
+- (instancetype)init_good {
+  if (self = [super init]) {
+    _listAdapter.dataSource = self;
+  }
+  return self;
+}
+
+- (instancetype)init_bad {
+  if (self = [super init]) {
+    _listAdapter.dataSourceStrong = self;
+  }
+  return self;
+}
+
 - (void)setAnalyticsTimeSpent:(AnalyticsTimeSpent*)timeSpent {
   _timeSpent = timeSpent;
 }
diff --git a/infer/tests/build_systems/objc_retain_cycles_weak/Makefile b/infer/tests/build_systems/objc_retain_cycles_weak/Makefile
index 9719a957f..2c293a23f 100644
--- a/infer/tests/build_systems/objc_retain_cycles_weak/Makefile
+++ b/infer/tests/build_systems/objc_retain_cycles_weak/Makefile
@@ -10,8 +10,8 @@ ROOT_DIR = $(TESTS_DIR)/../..
 CODETOANALYZE_DIR = ../codetoanalyze/objc_retain_cycles_weak
 
 ANALYZER = checkers
-SOURCES = $(CODETOANALYZE_DIR)/TimeSpent.m $(CODETOANALYZE_DIR)/AnalyticsTimeSpent.m
-OBJECTS = $(CODETOANALYZE_DIR)/TimeSpent.o $(CODETOANALYZE_DIR)/AnalyticsTimeSpent.o
+SOURCES = $(CODETOANALYZE_DIR)/TimeSpent.m $(CODETOANALYZE_DIR)/AnalyticsTimeSpent.m $(CODETOANALYZE_DIR)/ListAdapter.m
+OBJECTS = $(CODETOANALYZE_DIR)/TimeSpent.o $(CODETOANALYZE_DIR)/AnalyticsTimeSpent.o $(CODETOANALYZE_DIR)/ListAdapter.o
 INFER_OPTIONS = --biabduction-only --report-custom-error --developer-mode --project-root $(TESTS_DIR)
 INFERPRINT_OPTIONS = --project-root $(TESTS_DIR) --issues-tests
 
diff --git a/infer/tests/build_systems/objc_retain_cycles_weak/issues.exp b/infer/tests/build_systems/objc_retain_cycles_weak/issues.exp
index 2bc41937d..37778805a 100644
--- a/infer/tests/build_systems/objc_retain_cycles_weak/issues.exp
+++ b/infer/tests/build_systems/objc_retain_cycles_weak/issues.exp
@@ -1 +1,2 @@
-build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m, retain_cycle_weak_bad, 4, RETAIN_CYCLE, [start of procedure retain_cycle_weak_bad(),start of procedure init,start of procedure initWithDelegate:,return from a call to AnalyticsTimeSpent_initWithDelegate:,return from a call to TimeSpent_init,start of procedure initWithStrongDelegate:,return from a call to AnalyticsTimeSpent_initWithStrongDelegate:,start of procedure setAnalyticsTimeSpent:,return from a call to TimeSpent_setAnalyticsTimeSpent:]
+build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m, TimeSpent_init_bad, 2, RETAIN_CYCLE, ERROR, [start of procedure init_bad,Condition is true]
+build_systems/codetoanalyze/objc_retain_cycles_weak/TimeSpent.m, retain_cycle_weak_bad, 4, RETAIN_CYCLE, ERROR, [start of procedure retain_cycle_weak_bad(),start of procedure init,start of procedure initWithDelegate:,return from a call to AnalyticsTimeSpent_initWithDelegate:,return from a call to TimeSpent_init,start of procedure initWithStrongDelegate:,return from a call to AnalyticsTimeSpent_initWithStrongDelegate:]