diff --git a/lib/fort.c b/lib/fort.c
index 78fe6bc..4c628f4 100644
--- a/lib/fort.c
+++ b/lib/fort.c
@@ -3523,8 +3523,8 @@ void destroy_row(fort_row_t *row)
     if (row == NULL)
         return;
 
-    size_t i = 0;
     if (row->cells) {
+        size_t i = 0;
         size_t cells_n = vector_size(row->cells);
         for (i = 0; i < cells_n; ++i) {
             fort_cell_t *cell = *(fort_cell_t **)vector_at(row->cells, i);
diff --git a/src/row.c b/src/row.c
index f78d7d7..168efc3 100644
--- a/src/row.c
+++ b/src/row.c
@@ -37,8 +37,8 @@ void destroy_row(fort_row_t *row)
     if (row == NULL)
         return;
 
-    size_t i = 0;
     if (row->cells) {
+        size_t i = 0;
         size_t cells_n = vector_size(row->cells);
         for (i = 0; i < cells_n; ++i) {
             fort_cell_t *cell = *(fort_cell_t **)vector_at(row->cells, i);