diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.html b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.html
index c9bd621c75..c0e35f0e5b 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.html
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.html
@@ -1,4 +1,4 @@
-<div class="page-content" *ngIf="reportOfFire.motionSensor">
+<div class="page-content" *ngIf="reportOfFire.motionSensor === 'yes'">
     <div class="rof-text-primary-header">{{ title }}</div>
     <div class="rof-text-secondary-header">{{ message }}</div>
     <div id="compass-container">
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.ts
index 5d633a20a1..887845e3d1 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/compass-page/rof-compass-page.component.ts
@@ -81,11 +81,11 @@ async getOrientation() {
 handler(e, self) {
   if (self.reportOfFire?.headingDetectionActive){
     if (!e.alpha && !e.webkitCompassHeading){
-      this.reportOfFire.motionSensor = false;
+      this.reportOfFire.motionSensor = 'no';
       this.skip()
     }
     else {
-      this.reportOfFire.motionSensor = true;
+      this.reportOfFire.motionSensor = 'yes';
     }
 
     try {
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/complex-question-page/rof-complex-question-page.component.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/complex-question-page/rof-complex-question-page.component.ts
index 30fb22b70d..3c44dbb7de 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/complex-question-page/rof-complex-question-page.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/complex-question-page/rof-complex-question-page.component.ts
@@ -117,7 +117,7 @@ export class RoFComplexQuestionPage extends RoFPage {
   previousPage() {
     if (this.id === 'distance-page'){
       this.reportOfFire.headingDetectionActive = true;
-      if (this.reportOfFire.motionSensor) {
+      if (this.reportOfFire.motionSensor === 'yes') {
         this.previous();
       } else{
         this.reportOfFirePage.selectPage('callback-page',null,false)
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/contact-page/rof-contact-page.component.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/contact-page/rof-contact-page.component.ts
index 7d520d4723..6302f40325 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/contact-page/rof-contact-page.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/contact-page/rof-contact-page.component.ts
@@ -48,7 +48,7 @@ export class RoFContactPage extends RoFPage {
   }
 
   nextPage() {
-    if (this.reportOfFire.motionSensor) {
+    if (this.reportOfFire.motionSensor === 'yes') {
       this.next();
     } else{
       this.reportOfFirePage.selectPage('distance-page',null,false)
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.ts
index e215187769..c6c9e445cd 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.ts
@@ -312,7 +312,7 @@ export class ReportOfFirePage implements OnInit, AfterContentInit {
   skip () {
     if (this.currentPage.instance.id === 'callback-page' || this.currentPage.instance.id === 'contact-page') {
       this.reportOfFire.headingDetectionActive = true;
-      if (!this.reportOfFire.motionSensor) {
+      if (this.reportOfFire.motionSensor === 'no') {
         this.selectPage('distance-page',null,false);
       } else {
         this.currentPage.instance.skip();
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/reportOfFireModel.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/reportOfFireModel.ts
index 1af4999cd0..e610d80c75 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/reportOfFireModel.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/reportOfFireModel.ts
@@ -28,5 +28,5 @@ export class ReportOfFire {
   public currentLocation: Array<number> = [0, 0];
   public compassHeading: number = 0;
   public headingDetectionActive: boolean;
-  public motionSensor: boolean;
+  public motionSensor: string;
 }
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/rofPage.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/rofPage.ts
index 3cdf63483c..1fdf78161d 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/rofPage.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/rofPage.ts
@@ -30,7 +30,6 @@ export class RoFPage {
   public updateAttribute: string;
   public showProgress: boolean;
   public allowMultiSelect: boolean;
-  public motionSensor: boolean;
 
   initialize (data: any, index: number, reportOfFire: ReportOfFire) {
     this.allowExit = data.allowExit;
@@ -49,7 +48,6 @@ export class RoFPage {
     this.previousId = data.previousId || null;
     this.nextId = data.nextId || null;
     this.skipId = data.skipId || null;
-    this.motionSensor = false;
   }
 
   previous () {
diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/simple-question-page/rof-simple-question-page.component.ts b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/simple-question-page/rof-simple-question-page.component.ts
index e167e0a1d1..16a0d8af59 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/simple-question-page/rof-simple-question-page.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/simple-question-page/rof-simple-question-page.component.ts
@@ -96,7 +96,7 @@ export class RoFSimpleQuestionPage extends RoFPage {
   skipPage(){
     if (this.id === 'callback-page') {
       this.reportOfFire.headingDetectionActive = true;
-      if (this.reportOfFire.motionSensor) {
+      if (this.reportOfFire.motionSensor === 'yes') {
         this.skip();
       } else {
         this.reportOfFirePage.selectPage('distance-page',null,false);