diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 5a6b8db770a..b7e13ed723c 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -134,12 +134,24 @@ public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase databas
         }
 
         Optional<String> result = getFieldOrAlias(field);
-
         // If this field is not set, and the entry has a crossref, try to look up the
         // field in the referred entry: Do not do this for the bibtex key.
         if (!result.isPresent() && (database != null)) {
             Optional<BibEntry> referred = database.getReferencedEntry(this);
-            result = referred.flatMap(entry -> entry.getFieldOrAlias(field));
+            if (referred.isPresent()) {
+                result = referred.get().getFieldOrAlias(field);
+                if (!result.isPresent() && type.equals(StandardEntryType.InProceedings)) {
+                    if (field == StandardField.BOOKTITLE) {
+                        result = referred.get().getFieldOrAlias(StandardField.TITLE);
+                    }
+                    else if (field == StandardField.BOOKSUBTITLE) {
+                        result = referred.get().getFieldOrAlias(StandardField.SUBTITLE);
+                    }
+                    else if (field == StandardField.BOOKAUTHOR) {
+                        result = referred.get().getFieldOrAlias(StandardField.AUTHOR);
+                    }
+                }
+            }
         }
         return result.map(resultText -> BibDatabase.getText(resultText, database));
     }