diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
index 7efb7b178..6227e5999 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
@@ -835,7 +835,11 @@ public class LoanAccountData {
     }
 
     public Long officeId() {
-        return this.clientOfficeId;
+        Long officeId = this.clientOfficeId;
+        if (officeId == null) {
+            officeId = groupOfficeId();
+        }
+        return officeId;
     }
 
     public Long loanOfficerId() {