diff --git a/src/lib/parameters/flashparams/flashfs.c b/src/lib/parameters/flashparams/flashfs.c
index b9a8d11801..a692b62048 100644
--- a/src/lib/parameters/flashparams/flashfs.c
+++ b/src/lib/parameters/flashparams/flashfs.c
@@ -493,13 +493,14 @@ cont:
 				}
 			}
 
-			goto cont;
 		} else {
 
 			/* invalid CRC so keep looking */
 
 			pmagic++;
 		}
+
+		goto cont;
 	}
 
 	return NULL;
diff --git a/src/lib/parameters/flashparams/flashfs32.c b/src/lib/parameters/flashparams/flashfs32.c
index 368c011a14..5680beb5a9 100644
--- a/src/lib/parameters/flashparams/flashfs32.c
+++ b/src/lib/parameters/flashparams/flashfs32.c
@@ -502,14 +502,14 @@ cont:
 				}
 			}
 
-			goto cont;
-
 		} else {
 
 			/* invalid CRC so keep looking */
 
 			pmagic++;
 		}
+
+		goto cont;
 	}
 
 	return NULL;