diff --git a/infer/src/backend/preanal.ml b/infer/src/backend/preanal.ml
index 165426340..767bc1733 100644
--- a/infer/src/backend/preanal.ml
+++ b/infer/src/backend/preanal.ml
@@ -330,7 +330,9 @@ module NoReturn = struct
   let process proc_desc =
     Procdesc.iter_nodes
       (fun node ->
-        if has_noreturn_call node then Procdesc.set_succs node ~normal:(Some []) ~exn:None )
+        if has_noreturn_call node then
+          let exit_node = Procdesc.get_exit_node proc_desc in
+          Procdesc.set_succs node ~normal:(Some [exit_node]) ~exn:None )
       proc_desc
 end
 
diff --git a/infer/tests/codetoanalyze/c/errors/issues.exp b/infer/tests/codetoanalyze/c/errors/issues.exp
index 27206e6d4..16d2f3298 100644
--- a/infer/tests/codetoanalyze/c/errors/issues.exp
+++ b/infer/tests/codetoanalyze/c/errors/issues.exp
@@ -92,6 +92,7 @@ codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c, null_pointer
 codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c, null_pointer_with_function_pointer, 4, NULL_DEREFERENCE, B1
 codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c, potentially_null_pointer_passed_as_argument, 3, NULL_DEREFERENCE, B1
 codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c, simple_null_pointer, 2, NULL_DEREFERENCE, B1
+codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c, unreachable_null_no_return_ok_FP, 5, NULL_DEREFERENCE, B1
 codetoanalyze/c/errors/null_dereference/short.c, f_error, 2, NULL_DEREFERENCE, B1
 codetoanalyze/c/errors/null_dereference/short.c, g_error, 2, NULL_DEREFERENCE, B1
 codetoanalyze/c/errors/null_dereference/short.c, l_error, 2, NULL_DEREFERENCE, B1
diff --git a/infer/tests/codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c b/infer/tests/codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c
index 022bd0140..43d8976c8 100644
--- a/infer/tests/codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c
+++ b/infer/tests/codetoanalyze/c/errors/null_dereference/null_pointer_dereference.c
@@ -145,3 +145,14 @@ void unreachable_null_ok() {
   }
   *p = 42;
 }
+
+void no_ret() { will_not_return(); }
+
+// pre-analysis is not inter-procedural for handling no_return calls
+void unreachable_null_no_return_ok_FP() {
+  int* p = NULL;
+  if (p == NULL) {
+    no_ret(); // inter-procedural call to no_return
+  }
+  *p = 42;
+}